summaryrefslogtreecommitdiff
path: root/t/t7406-submodule-update.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-27 17:59:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-27 17:59:22 (GMT)
commit980ee776383cacdf77dd79667daa2efcb0b5882d (patch)
tree844cdd1419722a6937ba7a23a554aa308e75e030 /t/t7406-submodule-update.sh
parent2bef9beaf63b0d89a7fd397ceb3d61363c14cd2b (diff)
parenta4dded0189191db1aa572bdc45419182db8ae652 (diff)
downloadgit-980ee776383cacdf77dd79667daa2efcb0b5882d.zip
git-980ee776383cacdf77dd79667daa2efcb0b5882d.tar.gz
git-980ee776383cacdf77dd79667daa2efcb0b5882d.tar.bz2
Merge branch 'sb/submodule-update-initial-runs-custom-script'
A test fix. * sb/submodule-update-initial-runs-custom-script: t7406: correct test case for submodule-update initial population
Diffstat (limited to 't/t7406-submodule-update.sh')
-rwxr-xr-xt/t7406-submodule-update.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 347857f..4ac386d 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
'