summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2008-05-09 23:01:56 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-11 11:26:02 -0700
commita37cce3b23afa2c88baa2f1369c585e05bcf4526 (patch)
tree95b2cbe0d50f4187a9220b8209a12bc2c1e3547b
parentrepack: modify behavior of -A option to leave unreferenced objects unpacked (diff)
downloadtgif-a37cce3b23afa2c88baa2f1369c585e05bcf4526.tar.xz
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.
-rw-r--r--builtin-gc.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/builtin-gc.c b/builtin-gc.c
index f99ebc7926..6db2f513b7 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]);