aboutsummaryrefslogtreecommitdiff
path: root/t/t6050-replace.sh
diff options
context:
space:
mode:
authorNelson Elhage <nelhage@ksplice.com>2010-08-12 10:18:12 -0400
committerJunio C Hamano <gitster@pobox.com>2010-08-12 13:26:05 -0700
commit6e2a09d24b2634cdfec3395122cd4a07eb517b0d (patch)
treeae449e38f0318eda974a772a283f468203e726a0 /t/t6050-replace.sh
parentb5e233ecc411c8685463333d180a135c6866c50e (diff)
downloadgit-6e2a09d24b2634cdfec3395122cd4a07eb517b0d.tar.gz
git-6e2a09d24b2634cdfec3395122cd4a07eb517b0d.tar.xz
index-pack: Don't follow replace refs.
Without this, attempting to index a pack containing objects that have been replaced results in a fatal error that looks like: fatal: SHA1 COLLISION FOUND WITH <replaced-object> ! Signed-off-by: Nelson Elhage <nelhage@ksplice.com> Acked-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6050-replace.sh')
-rwxr-xr-xt/t6050-replace.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 203ffdb17..4185b7ca1 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -219,6 +219,12 @@ test_expect_success 'bisect and replacements' '
git bisect reset
'
+test_expect_success 'index-pack and replacements' '
+ git --no-replace-objects rev-list --objects HEAD |
+ git --no-replace-objects pack-objects test- &&
+ git index-pack test-*.pack
+'
+
#
#
test_done