Merge branch 'jk/quote-env-path-list-component' into maint

gitster · gitster · commit 27ee56f9db26 · 2017-03-28T13:52:28.000-07:00
A test fix.

* jk/quote-env-path-list-component:
  t5615: fix a here-doc syntax error
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
@@ -77,6 +77,7 @@ test_expect_success 'mix of quoted and unquoted alternates' '
 	check_obj "$quoted:$unquoted" <<-EOF
 	$one blob
 	$two blob
+	EOF
 '
 
 test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ test_expect_success 'mix of quoted and unquoted alternates' '`
`77`	`77`	`check_obj "$quoted:$unquoted" <<-EOF`
`78`	`78`	`$one blob`
`79`	`79`	`$two blob`
	`80`	`+ EOF`
`80`	`81`	`'`
`81`	`82`
`82`	`83`	`test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '`