summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-06-06 06:39:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-06-06 06:39:10 (GMT)
commit0d3505e286d64a351631fc8d7a5a92cb29832f16 (patch)
tree598c1fd965f19159862de9a5245c483838586856 /t
parent0481af98ba115ac055c95431110f4fdfa60ab171 (diff)
parentebee5580ca7e4dba06405713de14507909615966 (diff)
downloadgit-0d3505e286d64a351631fc8d7a5a92cb29832f16.zip
git-0d3505e286d64a351631fc8d7a5a92cb29832f16.tar.gz
git-0d3505e286d64a351631fc8d7a5a92cb29832f16.tar.bz2
Merge branch 'rs/parallel-checkout-test-fix'
Test fix. * rs/parallel-checkout-test-fix: parallel-checkout: avoid dash local bug in tests
Diffstat (limited to 't')
-rw-r--r--t/lib-parallel-checkout.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh
index 21f5759..83b279a 100644
--- a/t/lib-parallel-checkout.sh
+++ b/t/lib-parallel-checkout.sh
@@ -27,7 +27,7 @@ test_checkout_workers () {
rm -f "$trace_file" &&
GIT_TRACE2="$(pwd)/$trace_file" "$@" 2>&8 &&
- local workers=$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l) &&
+ local workers="$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l)" &&
test $workers -eq $expected_workers &&
rm "$trace_file"
} 8>&2 2>&4