From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2007 07:37:06 +0000 (-0700)
Subject: git-gc --auto: move threshold check to need_to_gc() function.
X-Git-Tag: v1.5.4-rc0~390^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=caf9de2f46471dc25180bf519c07537c00a68dda;p=git.git

git-gc --auto: move threshold check to need_to_gc() function.

That is where we decide if we are going to run gc
automatically.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-gc.c b/builtin-gc.c
index 093b3dda9..f046a2a66 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -80,6 +80,13 @@ static int need_to_gc(void)
 	int num_loose = 0;
 	int needed = 0;
 
+	/*
+	 * Setting gc.auto to 0 or negative can disable the
+	 * automatic gc
+	 */
+	if (gc_auto_threshold <= 0)
+		return 0;
+
 	if (sizeof(path) <= snprintf(path, sizeof(path), "%s/17", objdir)) {
 		warning("insanely long object directory %.*s", 50, objdir);
 		return 0;
@@ -129,8 +136,6 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 			continue;
 		}
 		if (!strcmp(arg, "--auto")) {
-			if (gc_auto_threshold <= 0)
-				return 0;
 			auto_gc = 1;
 			continue;
 		}