Merge branch 'bc/object-id'

diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index 971975bff4f8fb7cd3eeb3f50e212855c68b4f1a..bdf5198b7eff11f9a7bfb57239f5905d92fe4bf7 100755 (executable)
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -4,14 +4,22 @@ 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)
+then
+       skip_all='skipping lazy-init tests, single cpu'
+       test_done
+fi
+
+LAZY_THREAD_COST=2000
+
 test_expect_success 'no buffer overflow in lazy_init_name_hash' '
        (
-           test_seq 2000 | sed "s/^/a_/"
+           test_seq $LAZY_THREAD_COST | sed "s/^/a_/"
            echo b/b/b
-           test_seq 2000 | sed "s/^/c_/"
+           test_seq $LAZY_THREAD_COST | sed "s/^/c_/"
            test_seq 50 | sed "s/^/d_/" | tr "\n" "/"; echo d
        ) |
-       sed -e "s/^/100644 $EMPTY_BLOB  /" |
+       sed "s/^/100644 $EMPTY_BLOB     /" |
        git update-index --index-info &&
        test-lazy-init-name-hash -m
 '