mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
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
This commit is contained in:
commit
04b4f7d579
@ -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
|
||||
'
|
||||
|
Loading…
Reference in New Issue
Block a user