aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-03-19 16:53:20 -0500
committerJunio C Hamano <gitster@pobox.com>2008-03-19 17:29:52 -0700
commitb14d255ba8362a4debe51dc67d6b98d06fdc36aa (patch)
tree7a8e731c731c3cec6c97a0122ee77613139a6608
parent02b00e16bb372fd13e1ac440e9fbafd223d43af0 (diff)
downloadgit-b14d255ba8362a4debe51dc67d6b98d06fdc36aa.tar.gz
git-b14d255ba8362a4debe51dc67d6b98d06fdc36aa.tar.xz
builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto
The gc.auto configuration variable is somewhat ambiguous now that there is also a gc.autopacklimit setting. Some users may assume that it controls all auto-gc'ing. Also, now users must set two configuration variables to zero when they want to disable autopacking. Since it is unlikely that users will want to autopack based on some threshold of pack files when they have disabled autopacking based on the number of loose objects, be nice and allow a setting of zero for gc.auto to disable all autopacking. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-gc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-gc.c b/builtin-gc.c
index 95917d74a..509bb9c6b 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -160,10 +160,10 @@ static int too_many_packs(void)
static int need_to_gc(void)
{
/*
- * Setting gc.auto and gc.autopacklimit to 0 or negative can
- * disable the automatic gc.
+ * Setting gc.auto to 0 or negative can disable the
+ * automatic gc.
*/
- if (gc_auto_threshold <= 0 && gc_auto_pack_limit <= 0)
+ if (gc_auto_threshold <= 0)
return 0;
/*