From: Brandon Casey <drafnel@gmail.com>
Date: Sat, 10 May 2008 04:01:56 +0000 (-0500)
Subject: git-gc: always use -A when manually repacking
X-Git-Tag: v1.5.6-rc0~22^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a37cce3b23afa2c88baa2f1369c585e05bcf4526;p=git.git

git-gc: always use -A when manually repacking

Now that repack -A will leave unreferenced objects unpacked, there is
no reason to use the -a option to repack (which will discard unreferenced
objects). The unpacked unreferenced objects will not be repacked by a
subsequent repack, and will eventually be pruned by git-gc based on the
gc.pruneExpire config option.
---

diff --git a/builtin-gc.c b/builtin-gc.c
index f99ebc792..6db2f513b 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -256,17 +256,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 			"performance. You may also\n"
 			"run \"git gc\" manually. See "
 			"\"git help gc\" for more information.\n");
-	} else {
-		/*
-		 * Use safer (for shared repos) "-A" option to
-		 * repack when not pruning. Auto-gc makes its
-		 * own decision.
-		 */
-		if (prune)
-			append_option(argv_repack, "-a", MAX_ADD);
-		else
-			append_option(argv_repack, "-A", MAX_ADD);
-	}
+	} else
+		append_option(argv_repack, "-A", MAX_ADD);
 
 	if (pack_refs && run_command_v_opt(argv_pack_refs, RUN_GIT_CMD))
 		return error(FAILED_RUN, argv_pack_refs[0]);