Skip to content

Commit

Permalink
parallel-checkout: avoid dash local bug in tests
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
rscharfe authored and gitster committed Jun 6, 2021
1 parent 87094fc commit ebee558
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/lib-parallel-checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ebee558

Please sign in to comment.