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

Merge branch 'np/no-loosen-prune-expire-now' into maint

Browse Source 
* np/no-loosen-prune-expire-now:
  objects to be pruned immediately don't have to be loosened
This commit is contained in:
Junio C Hamano 2009-01-28 23:42:10 -08:00
commit 8e7d1f6d03
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]);