diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 07:45:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 07:45:03 (GMT) |
| commit | 130b04ab37d74e574d525df7948b963b13c6bdbf (patch) | |
| tree | a39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 /git-repack.sh | |
| parent | a7c1ef3e03985c70aeb0825634471bb6240f4fcb (diff) | |
| parent | 7f3140cd23f126e578ccaaea8c2cebe36824a7ac (diff) | |
| download | git-130b04ab37d74e574d525df7948b963b13c6bdbf.zip git-130b04ab37d74e574d525df7948b963b13c6bdbf.tar.gz git-130b04ab37d74e574d525df7948b963b13c6bdbf.tar.bz2 | |
Merge branch 'js/maint-graft-unhide-true-parents'
* js/maint-graft-unhide-true-parents:
git repack: keep commits hidden by a graft
Add a test showing that 'git repack' throws away grafted-away parents
Conflicts:
git-repack.sh
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 1bf2394..1eb3bca 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -81,7 +81,7 @@ case ",$all_into_one," in esac args="$args $local ${GIT_QUIET:+-q} $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 say Nothing new to pack. |