From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 23:37:54 +0000 (-0700)
Subject: Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint
X-Git-Tag: v1.7.5.2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a8793d2178b8305be55b1c88ac13fbb7dc52a076?hp=90e8b9b23dff20946a0eacdf8abedce7e32c1d78

Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint

* jc/t1506-shell-param-expansion-gotcha:
t1507: avoid "${parameter<op>'word'}" inside double-quotes
---

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
 }