diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-19 07:19:30 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-19 07:19:30 +0400 |
| commit | c4398286fa5245cf54d73f6016444179d73f140b (patch) | |
| tree | 7615ae9e816ae37148e70e335a1d95a54216e890 /t | |
| parent | 8435bdfdc3dca1b19721e013374d936164928e33 (diff) | |
| parent | 5f020f720298ddba537f857a240ffa7debb05f54 (diff) | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5300-pack-object.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 3a0ef8759c..b335c6b42d 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' \ |