t3506: validate '-m 1 -ff' is now accepted for non-merge commits

diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index bdf5198b7eff11f9a7bfb57239f5905d92fe4bf7..64f047332b51cefea37bd5b8b40e863be77dfc77 100755 (executable)
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -4,7 +4,7 @@ test_description='Test the lazy init name hash with various folder structures'
 
 . ./test-lib.sh
 
-if test 1 -eq $($GIT_BUILD_DIR/t/helper/test-online-cpus)
+if test 1 -eq $($GIT_BUILD_DIR/t/helper/test-tool online-cpus)
 then
        skip_all='skipping lazy-init tests, single cpu'
        test_done
@@ -14,14 +14,14 @@ 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 &&
-       test-lazy-init-name-hash -m
+       test-tool lazy-init-name-hash -m
 '
 
 test_done