Merge branch 'ab/workaround-dash-bug-in-test'

gitster · gitster · commit 60a3fbf50032 · 2019-02-22T21:20:19.000-08:00
* ab/workaround-dash-bug-in-test:
  tests: avoid syntax triggering old dash bug
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
@@ -892,6 +892,7 @@ test_expect_success 'get --expiry-date' '
 	1510348087
 	0
 	EOF
+	: "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
 	{
 		echo "$rel_out $(git config --expiry-date date.valid1)"
 		git config --expiry-date date.valid2 &&

Original file line number	Diff line number	Diff line change
`@@ -892,6 +892,7 @@ test_expect_success 'get --expiry-date' '`
`892`	`892`	`1510348087`
`893`	`893`	`0`
`894`	`894`	`EOF`
	`895`	`+ : "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&`
`895`	`896`	`{`
`896`	`897`	`echo "$rel_out $(git config --expiry-date date.valid1)"`
`897`	`898`	`git config --expiry-date date.valid2 &&`