undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

objects to be pruned immediately don't have to be loosened

Browse Source 
When there is no grace period before pruning unreferenced objects, it is
pointless to push those objects in their loose form just to delete them
right away.

Also be more explicit about the possibility of using "now" in the
gc.pruneexpire config variable (needed for the above behavior to
happen).

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre 2008-12-30 14:45:11 -05:00 committed by Junio C Hamano
parent 936b7057e8
commit 8e8daf3363
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@ -702,7 +702,9 @@ gc.packrefs::
gc.pruneexpire:: gc.pruneexpire::
When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'. When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
Override the grace period with this config variable. Override the grace period with this config variable. The value
"now" may be used to disable this grace period and always prune
unreachable objects immediately.
gc.reflogexpire:: gc.reflogexpire::
'git-reflog expire' removes reflog entries older than 'git-reflog expire' removes reflog entries older than

8
builtin-gc.c
View File

@ -188,7 +188,9 @@ static int need_to_gc(void)
* there is no need. * there is no need.
*/ */
if (too_many_packs()) if (too_many_packs())
append_option(argv_repack, "-A", MAX_ADD); append_option(argv_repack,
!strcmp(prune_expire, "now") ? "-a" : "-A",
MAX_ADD);
else if (!too_many_loose_objects()) else if (!too_many_loose_objects())
return 0; return 0;
@ -243,7 +245,9 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
"run \"git gc\" manually. See " "run \"git gc\" manually. See "
"\"git help gc\" for more information.\n"); "\"git help gc\" for more information.\n");
} else } else
append_option(argv_repack, "-A", MAX_ADD); append_option(argv_repack,
!strcmp(prune_expire, "now") ? "-a" : "-A",
MAX_ADD);
if (pack_refs && run_command_v_opt(argv_pack_refs, RUN_GIT_CMD)) if (pack_refs && run_command_v_opt(argv_pack_refs, RUN_GIT_CMD))
return error(FAILED_RUN, argv_pack_refs[0]); return error(FAILED_RUN, argv_pack_refs[0]);