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

git-gc: by default use safer "-A" option to repack when not --prune'ing

Browse Source 
This makes use of repack's new "-A" option which does not drop packed
unreachable objects. This makes git-gc safe to call at any time,
particularly when a repository is referenced as an alternate by
another repository.

git-gc --prune will use the "-a" option to repack instead of "-A", so
that packed unreachable objects will be removed.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Brandon Casey 2007-10-10 19:59:19 -05:00 committed by Shawn O. Pearce
parent 2f27f8509e
commit edb0e04e81
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-gc.c
View File

@ -26,7 +26,7 @@ static int gc_auto_pack_limit = 20;
#define MAX_ADD 10 #define MAX_ADD 10
static const char *argv_pack_refs[] = {"pack-refs", "--all", "--prune", NULL}; static const char *argv_pack_refs[] = {"pack-refs", "--all", "--prune", NULL};
static const char *argv_reflog[] = {"reflog", "expire", "--all", NULL}; static const char *argv_reflog[] = {"reflog", "expire", "--all", NULL};
static const char *argv_repack[MAX_ADD] = {"repack", "-a", "-d", "-l", NULL}; static const char *argv_repack[MAX_ADD] = {"repack", "-d", "-l", NULL};
static const char *argv_prune[] = {"prune", NULL}; static const char *argv_prune[] = {"prune", NULL};
static const char *argv_rerere[] = {"rerere", "gc", NULL}; static const char *argv_rerere[] = {"rerere", "gc", NULL};
@ -211,6 +211,16 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
prune = 0; prune = 0;
if (!need_to_gc()) if (!need_to_gc())
return 0; return 0;
} 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);
} }
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))