Merge branch 'sg/revision-parser-skip-prefix' into maint

diff --git a/t/perf/p0004-lazy-init-name-hash.sh b/t/perf/p0004-lazy-init-name-hash.sh
index d30c32f97b3bdbe1464e307e8bea26adb4a5c2cc..8de5a98cfc6c513bb35cd8355f3e831ab3a8007d 100755 (executable)
--- a/t/perf/p0004-lazy-init-name-hash.sh
+++ b/t/perf/p0004-lazy-init-name-hash.sh
@@ -8,14 +8,13 @@ test_checkout_worktree
 
 test_expect_success 'verify both methods build the same hashmaps' '
        test-lazy-init-name-hash --dump --single >out.single &&
-       test-lazy-init-name-hash --dump --multi >out.multi &&
-       sort <out.single >sorted.single &&
-       sort <out.multi >sorted.multi &&
-       test_cmp sorted.single sorted.multi
-'
-
-test_expect_success 'multithreaded should be faster' '
-       test-lazy-init-name-hash --perf >out.perf
+       if test-lazy-init-name-hash --dump --multi >out.multi
+       then
+               test_set_prereq REPO_BIG_ENOUGH_FOR_MULTI &&
+               sort <out.single >sorted.single &&
+               sort <out.multi >sorted.multi &&
+               test_cmp sorted.single sorted.multi
+       fi
 '
 
 test_expect_success 'calibrate' '
@@ -50,7 +49,7 @@ test_perf "single-threaded, $desc" "
        test-lazy-init-name-hash --single --count=$count
 "
 
-test_perf "multi-threaded, $desc" "
+test_perf REPO_BIG_ENOUGH_FOR_MULTI "multi-threaded, $desc" "
        test-lazy-init-name-hash --multi --count=$count
 "