merge: refuse --commit with --squash

diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index 08af596ba6c6b032eb1696c3beaba7c1776b4fd5..64f047332b51cefea37bd5b8b40e863be77dfc77 100755 (executable)
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -14,10 +14,10 @@ LAZY_THREAD_COST=2000
 
 test_expect_success 'no buffer overflow in lazy_init_name_hash' '
        (
-           test_seq $LAZY_THREAD_COST | sed "s/^/a_/"
-           echo b/b/b
-           test_seq $LAZY_THREAD_COST | sed "s/^/c_/"
-           test_seq 50 | sed "s/^/d_/" | tr "\n" "/"; echo d
+           test_seq $LAZY_THREAD_COST | sed "s/^/a_/" &&
+           echo b/b/b &&
+           test_seq $LAZY_THREAD_COST | sed "s/^/c_/" &&
+           test_seq 50 | sed "s/^/d_/" | tr "\n" "/" && echo d
        ) |
        sed "s/^/100644 $EMPTY_BLOB     /" |
        git update-index --index-info &&