aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorMatt McCutchen <matt@mattmccutchen.net>2016-11-15 14:08:51 -0500
committerJunio C Hamano <gitster@pobox.com>2016-11-16 13:42:17 -0800
commitf1350d0c125a1e6a73e3b6461fa90c77843c5f74 (patch)
tree41e3d58e1632d5d3d417bb7b79075a3015dcd4fb /Documentation/config.txt
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
downloadgit-f1350d0c125a1e6a73e3b6461fa90c77843c5f74.tar.gz
git-f1350d0c125a1e6a73e3b6461fa90c77843c5f74.tar.xz
git-gc.txt: expand discussion of races with other processes
In general, "git gc" may delete objects that another concurrent process is using but hasn't created a reference to. Git has some mitigations, but they fall short of a complete solution. Document this in the git-gc(1) man page and add a reference from the documentation of the gc.pruneExpire config variable. Based on a write-up by Jeff King: http://marc.info/?l=git&m=147922960131779&w=2 Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 02696208c..31df3725c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1341,7 +1341,9 @@ gc.pruneExpire::
Override the grace period with this config variable. The value
"now" may be used to disable this grace period and always prune
unreachable objects immediately, or "never" may be used to
- suppress pruning.
+ suppress pruning. This feature helps prevent corruption when
+ 'git gc' runs concurrently with another process writing to the
+ repository; see the "NOTES" section of linkgit:git-gc[1].
gc.worktreePruneExpire::
When 'git gc' is run, it calls