From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Mar 2017 20:52:29 +0000 (-0700)
Subject: Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint
X-Git-Tag: v2.12.3~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/04b4f7d579056cedaae2de0a019e5993b4d9c2d0?hp=27ee56f9db26fb863f5f449cb3e7dade932f953a

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

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
index 347857fa7c..4ac386d98b 100755
--- 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
 '