diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-13 11:02:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 11:02:47 -0700 |
| commit | d6ad4ff1202bd79f6470e8699bbd16d6ceb6ae98 (patch) | |
| tree | 0a293be580b7ee29aae1d44e468d5a8e4390b9be | |
| parent | Merge branch 'rr/rerere-libify-clear-gc' (diff) | |
| parent | t1507: avoid "${parameter<op>'word'}" inside double-quotes (diff) | |
| download | tgif-d6ad4ff1202bd79f6470e8699bbd16d6ceb6ae98.tar.xz | |
Merge branch 'jc/t1506-shell-param-expansion-gotcha'
* jc/t1506-shell-param-expansion-gotcha:
t1507: avoid "${parameter<op>'word'}" inside double-quotes
| -rwxr-xr-x | t/t1506-rev-parse-diagnosis.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh index 4a6396f9e3..0843a1c13b 100755 --- a/t/t1506-rev-parse-diagnosis.sh +++ b/t/t1506-rev-parse-diagnosis.sh @@ -8,8 +8,11 @@ exec </dev/null test_did_you_mean () { - printf "fatal: Path '$2$3' $4, but not ${5:-'$3'}.\n" >expected && - printf "Did you mean '$1:$2$3'${2:+ aka '$1:./$3'}?\n" >>expected && + sq="'" && + cat >expected <<-EOF && + fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}. + Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}? + EOF test_cmp expected error } |