@matheusbsbs / matheus-bagliano / commits / 365c2aaafc

t1507: avoid "${parameter<op>'word'}" inside double-quotes

Kacper Kornet noticed that a $variable in "word" in the above construct is not substituted by his pdksh. Modern POSIX compliant shells (e.g. dash, ksh, bash) all seem to interpret POSIX "2.6.2 Parameter Expansion" that says "word shall be subjected to tilde expansion, parameter expansion, command substitution, and arithmetic expansion" in ${parameter<op>word}, to mean that the word is expanded as if it appeared in dq pairs, so if the word were "'$variable'" (sans dq) it would expand to a single quote, the value of the $variable and then a single quote. Johannes Sixt reports that the behavior of quoting at the right of :- when the ${...:-...} expansion appears in double-quotes was debated recently at length at the Austin group. We can avoid this issue and future-proof the test by a slight rewrite. Helped-by: Johannes Sixt <j.sixt@viscovery.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 8, 2011 at 21:43 UTC 365c2aaafcdefa65db994ff13071a3a7cd7910fc

1 file changed +5 -2

t/t1506-rev-parse-diagnosis.sh

+5 -2

@@ -8,8 +8,11 @@ exec </dev/null

9 test_did_you_mean ()

10 {

11 - printf "fatal: Path '$2$3' $4, but not ${5:-'$3'}.\n" >expected &&

12 - printf "Did you mean '$1:$2$3'${2:+ aka '$1:./$3'}?\n" >>expected &&

11 + sq="'" &&

12 + cat >expected <<-EOF &&

13 + fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}.

14 + Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}?

15 + EOF

16 test_cmp expected error

17 }