Merge branch 'mg/rebase-i-onto-reflog-in-full'

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 4fd69a19ebab07cc0ca784b63a7f02ddd613f306..2e52f8b83894faa0aeb324d8c43193b2cc9ea0cc 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -418,4 +418,9 @@ test_expect_success \
     'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
      grep "SHA1 COLLISION FOUND" msg'
 
+test_expect_success \
+    'make sure index-pack detects the SHA1 collision (large blobs)' \
+    'test_must_fail git -c core.bigfilethreshold=1 index-pack -o bad.idx test-3.pack 2>msg &&
+     grep "SHA1 COLLISION FOUND" msg'
+
 test_done