From: Brandon Casey <drafnel@gmail.com>
Date: Sat, 10 May 2008 04:01:57 +0000 (-0500)
Subject: builtin-gc.c: deprecate --prune, it now really has no effect
X-Git-Tag: v1.5.6-rc0~22^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e7d501990a9c63db264f3185fc311f446196427;p=git.git

builtin-gc.c: deprecate --prune, it now really has no effect
---

diff --git a/builtin-gc.c b/builtin-gc.c
index 6db2f513b..48f7d95f9 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -219,7 +219,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	char buf[80];
 
 	struct option builtin_gc_options[] = {
-		OPT_BOOLEAN(0, "prune", &prune, "prune unreferenced objects"),
+		OPT_BOOLEAN(0, "prune", &prune, "prune unreferenced objects (deprecated)"),
 		OPT_BOOLEAN(0, "aggressive", &aggressive, "be more thorough (increased runtime)"),
 		OPT_BOOLEAN(0, "auto", &auto_gc, "enable auto-gc mode"),
 		OPT_BOOLEAN('q', "quiet", &quiet, "suppress progress reports"),
@@ -249,7 +249,6 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		/*
 		 * Auto-gc should be least intrusive as possible.
 		 */
-		prune = 0;
 		if (!need_to_gc())
 			return 0;
 		fprintf(stderr, "Auto packing your repository for optimum "