aboutsummaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2009-07-23 17:33:49 +0200
committerJunio C Hamano <gitster@pobox.com>2009-07-24 09:10:16 -0700
commit7f3140cd23f126e578ccaaea8c2cebe36824a7ac (patch)
treed195e6f3e3002fdd55ef93ed10c087f22514cca3 /builtin-pack-objects.c
parent1ec648278e3a3e5a04dfaac916f68e2f675ff9ea (diff)
downloadgit-7f3140cd23f126e578ccaaea8c2cebe36824a7ac.tar.gz
git-7f3140cd23f126e578ccaaea8c2cebe36824a7ac.tar.xz
git repack: keep commits hidden by a graft
When you have grafts that pretend that a given commit has different parents than the ones recorded in the commit object, it is dangerous to let 'git repack' remove those hidden parents, as you can easily remove the graft and end up with a broken repository. So let's play it safe and keep those parent objects and everything that is reachable by them, in addition to the grafted parents. As this behavior can only be triggered by git pack-objects, and as that command handles duplicate parents gracefully, we do not bother to cull duplicated parents that may result by using both true and grafted parents. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 941cc2d73..527638168 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -2259,6 +2259,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
die("bad %s", arg);
continue;
}
+ if (!strcmp(arg, "--keep-true-parents")) {
+ grafts_replace_parents = 0;
+ continue;
+ }
usage(pack_usage);
}