Browse Source

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
maint
Junio C Hamano 8 years ago
parent
commit
980ee77638
  1. 6
      t/t7406-submodule-update.sh

6
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' ' 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'\'' Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
EOF && EOF
rm -rf super/submodule && 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 && test_cmp expect actual &&
git -C super submodule update --checkout git -C super submodule update --checkout
' '

Loading…
Cancel
Save