Andrew's git / gitweb.git / diff
?
builtin-gc.c: deprecate --prune, it now really has no effect
authorBrandon Casey <drafnel@gmail.com>
Sat, 10 May 2008 04:01:57 +0000 (23:01 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 18:26:07 +0000 (11:26 -0700)
builtin-gc.c patch | blob | history
diff --git a/builtin-gc.c b/builtin-gc.c
index 6db2f513b78c9f47a54c9bfdbf21df105b4c46ab..48f7d95f9784d27f023b22343929f5ad188caa4c 100644 (file)
--- 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[] = {
        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"),
                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.
                 */
                /*
                 * Auto-gc should be least intrusive as possible.
                 */
-               prune = 0;
                if (!need_to_gc())
                        return 0;
                fprintf(stderr, "Auto packing your repository for optimum "
                if (!need_to_gc())
                        return 0;
                fprintf(stderr, "Auto packing your repository for optimum "