Merge branch 'maint'

diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index b0b0fdaca5e9ddfda6b1625545b9ba7049cf1555..884e24253a0a9d262b39ae96ea5c03ecb7ba4072 100755 (executable)
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -196,7 +196,8 @@ test_expect_success \
 
 test_expect_success \
     '[index v2] 5) pack-objects refuses to reuse corrupted data' \
-    'test_must_fail git pack-objects test-5 <obj-list'
+    'test_must_fail git pack-objects test-5 <obj-list &&
+     test_must_fail git pack-objects --no-reuse-object test-6 <obj-list'
 
 test_expect_success \
     '[index v2] 6) verify-pack detects CRC mismatch' \