From: Jan Palus <jan.palus@xxxxxxxxx>
The came in an earlier sb/submodule-update-initial-runs-custom-script
topic that was merged to 2.12.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* This should be applied on top of e7b37caf ("submodule update: run
custom update script for initial populating as well", 2017-01-25)
t/t7406-submodule-update.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 347857fa7c..a20df9420a 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -442,9 +442,9 @@ 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_cmp expect actual &&
--
2.12.1-430-gafd6726309