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

gitster · gitster · commit a8793d2178b8 · 2011-05-16T16:37:54.000-07:00
* jc/t1506-shell-param-expansion-gotcha:
  t1507: avoid "${parameter&lt;op&gt;'word'}" inside double-quotes
diff --git 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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,11 @@ exec </dev/null`
`8`	`8`
`9`	`9`	`test_did_you_mean ()`
`10`	`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`
`13`	`16`	`test_cmp expected error`
`14`	`17`	`}`
`15`	`18`