diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:29 -0700 |
| commit | 04b4f7d579056cedaae2de0a019e5993b4d9c2d0 (patch) | |
| tree | a181b650d7c0aab950e20dd693049f619aef0d88 | |
| parent | 27ee56f9db26fb863f5f449cb3e7dade932f953a (diff) | |
| parent | a4dded0189191db1aa572bdc45419182db8ae652 (diff) | |
| download | git-04b4f7d579056cedaae2de0a019e5993b4d9c2d0.tar.gz | |
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
| -rwxr-xr-x | t/t7406-submodule-update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 ' |