diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:37:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:37:54 -0700 |
| commit | a8793d2178b8305be55b1c88ac13fbb7dc52a076 (patch) | |
| tree | 1b13cb8ac8d3f2cb66a8910f7376861b25c56517 | |
| parent | 90e8b9b23dff20946a0eacdf8abedce7e32c1d78 (diff) | |
| parent | 365c2aaafcdefa65db994ff13071a3a7cd7910fc (diff) | |
| download | git-a8793d2178b8305be55b1c88ac13fbb7dc52a076.tar.gz | |
Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint
* 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 } |