From: Nicolas Pitre <nico@cam.org>
Date: Tue, 2 Sep 2008 14:22:22 +0000 (-0400)
Subject: t5300: improve SHA1 collision test
X-Git-Tag: v1.6.1-rc1~229^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f020f720298ddba537f857a240ffa7debb05f54;p=git.git

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>
---

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' \