Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint

gitster · gitster · commit 04b4f7d57905 · 2017-03-28T13:52:29.000-07:00
A test fix.

* sb/submodule-update-initial-runs-custom-script:
  t7406: correct test case for submodule-update initial population
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
@@ -442,11 +442,11 @@ test_expect_success 'submodule update - command in .git/config catches failure -
 '
 
 test_expect_success 'submodule update - command run for initial population of submodule' '
-	cat <<-\ EOF >expect
+	cat >expect <<-EOF &&
 	Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
-	EOF &&
+	EOF
 	rm -rf super/submodule &&
-	test_must_fail git -C super submodule update >../actual &&
+	test_must_fail git -C super submodule update 2>actual &&
 	test_cmp expect actual &&
 	git -C super submodule update --checkout
 '

Original file line number	Diff line number	Diff line change
`@@ -442,11 +442,11 @@ test_expect_success 'submodule update - command in .git/config catches failure -`
`442`	`442`	`'`
`443`	`443`
`444`	`444`	`test_expect_success 'submodule update - command run for initial population of submodule' '`
`445`		`- cat <<-\ EOF >expect`
	`445`	`+ cat >expect <<-EOF &&`
`446`	`446`	`Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''`
`447`		`- EOF &&`
	`447`	`+ EOF`
`448`	`448`	`rm -rf super/submodule &&`
`449`		`- test_must_fail git -C super submodule update >../actual &&`
	`449`	`+ test_must_fail git -C super submodule update 2>actual &&`
`450`	`450`	`test_cmp expect actual &&`
`451`	`451`	`git -C super submodule update --checkout`
`452`	`452`	`'`