summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-25 00:45:03 -0700
committerJunio C Hamano <gitster@pobox.com>2009-07-25 00:45:03 -0700
commit130b04ab37d74e574d525df7948b963b13c6bdbf (patch)
treea39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 /git-repack.sh
parenta7c1ef3e03985c70aeb0825634471bb6240f4fcb (diff)
parent7f3140cd23f126e578ccaaea8c2cebe36824a7ac (diff)
downloadgit-130b04ab37d74e574d525df7948b963b13c6bdbf.tar.gz
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-xgit-repack.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-repack.sh b/git-repack.sh
index 1bf239499c..1eb3bca352 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.