Skip to content

Commit ebee558

Browse files
rscharfegitster
authored andcommitted
parallel-checkout: avoid dash local bug in tests
Dash bug https://bugs.launchpad.net/ubuntu/+source/dash/+bug/139097 lets the shell erroneously perform field splitting on the expansion of a command substitution during declaration of a local variable. It causes the parallel-checkout tests to fail e.g. when running them with /bin/dash on MacOS 11.4, where they error out like this: ./t2080-parallel-checkout-basics.sh: 33: local: 0: bad variable name That's because the output of wc -l contains leading spaces and the returned number of lines is treated as another variable to declare, i.e. as in "local workers= 0". Work around it by enclosing the command substitution in quotes. Helped-by: Matheus Tavares Bernardino <[email protected]> Helped-by: SZEDER Gábor <[email protected]> Helped-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: René Scharfe <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 87094fc commit ebee558

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/lib-parallel-checkout.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test_checkout_workers () {
2727
rm -f "$trace_file" &&
2828
GIT_TRACE2="$(pwd)/$trace_file" "$@" 2>&8 &&
2929

30-
local workers=$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l) &&
30+
local workers="$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l)" &&
3131
test $workers -eq $expected_workers &&
3232
rm "$trace_file"
3333
} 8>&2 2>&4

0 commit comments

Comments
 (0)