diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-07-23 17:33:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-24 09:10:16 -0700 |
| commit | 7f3140cd23f126e578ccaaea8c2cebe36824a7ac (patch) | |
| tree | d195e6f3e3002fdd55ef93ed10c087f22514cca3 /git-repack.sh | |
| parent | 1ec648278e3a3e5a04dfaac916f68e2f675ff9ea (diff) | |
| download | git-7f3140cd23f126e578ccaaea8c2cebe36824a7ac.tar.gz | |
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 'git-repack.sh')
| -rwxr-xr-x | git-repack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-repack.sh b/git-repack.sh index 0868734723..be0c8435dc 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -81,7 +81,7 @@ case ",$all_into_one," in esac args="$args $local $quiet $no_reuse$extra" -names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") || +names=$(git pack-objects --keep-true-parents --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") || exit 1 if [ -z "$names" ]; then if test -z "$quiet"; then |