aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2008-09-02 10:22:22 -0400
committerJunio C Hamano <gitster@pobox.com>2008-09-02 17:05:56 -0700
commit5f020f720298ddba537f857a240ffa7debb05f54 (patch)
treefd70468d47102f2201e11750d20db424b52c827d
parenteede9f42b52b4001ffe844af061315b766682a69 (diff)
downloadgit-5f020f720298ddba537f857a240ffa7debb05f54.tar.gz
git-5f020f720298ddba537f857a240ffa7debb05f54.tar.xz
t5300: improve SHA1 collision test
Make sure the reason for the command failure is actually due to the detection of SHA1 collision. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5300-pack-object.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 83abe5f25..8a8b0f1ab 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -272,7 +272,8 @@ test_expect_success \
test_expect_success \
'make sure index-pack detects the SHA1 collision' \
- 'test_must_fail git-index-pack -o bad.idx test-3.pack'
+ 'test_must_fail git-index-pack -o bad.idx test-3.pack 2>msg &&
+ grep "SHA1 COLLISION FOUND" msg'
test_expect_success \
'honor pack.packSizeLimit' \