From: Junio C Hamano Date: Fri, 19 Sep 2008 03:19:30 +0000 (-0700) Subject: Merge branch 'np/pack' X-Git-Tag: v1.6.1-rc1~229 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4398286fa5245cf54d73f6016444179d73f140b;p=git.git Merge branch 'np/pack' * np/pack: t5300: improve SHA1 collision test pack-objects: don't include missing preferred base objects sha1write: don't copy full sized buffers Conflicts: t/t5300-pack-object.sh --- c4398286fa5245cf54d73f6016444179d73f140b diff --cc t/t5300-pack-object.sh index 3a0ef8759,8a8b0f1ab..b335c6b42 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@@ -272,7 -272,8 +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 && ++ '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' \