@ -460,12 +460,12 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
@@ -460,12 +460,12 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
) &&
git checkout HEAD^ &&
(cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../expect
git rev-parse --verify HEAD >../expect
) &&
git config submodule.submodule.update merge &&
test_must_fail git submodule update &&
(cd submodule2 &&
git rev-parse --max-count=1 HEAD > ../actual
git rev-parse --verify HEAD >../actual
) &&
test_cmp expect actual
)
@ -495,12 +495,12 @@ test_expect_success 'submodule update exit immediately after recursive rebase er
@@ -495,12 +495,12 @@ test_expect_success 'submodule update exit immediately after recursive rebase er