From: Brandon Casey Date: Wed, 19 Mar 2008 21:53:20 +0000 (-0500) Subject: builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto X-Git-Tag: v1.5.5-rc1~13 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b14d255ba8362a4debe51dc67d6b98d06fdc36aa;p=git.git 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 Signed-off-by: Junio C Hamano --- 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; /*