Merge branch 'dl/test-must-fail-fixes-5'

[thirdparty/git.git] / t / t4255-am-submodule.sh

diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh
index 0ba8194403f6740807cbd63d1bda8a69091e3d6b..a7ba08f728c0b870bf899ee82220a1708699dcb0 100755 (executable)
--- a/t/t4255-am-submodule.sh
+++ b/t/t4255-am-submodule.sh
@@ -6,17 +6,21 @@ test_description='git am handling submodules'
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
 am () {
-       git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
+       git format-patch --stdout --ignore-submodules=dirty "..$1" >patch &&
+       may_only_be_test_must_fail "$2" &&
+       $2 git am patch
 }
 
-test_submodule_switch "am"
+test_submodule_switch_func "am"
 
 am_3way () {
-       git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
+       git format-patch --stdout --ignore-submodules=dirty "..$1" >patch &&
+       may_only_be_test_must_fail "$2" &&
+       $2 git am --3way patch
 }
 
 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "am_3way"
+test_submodule_switch_func "am_3way"
 
 test_expect_success 'setup diff.submodule' '
        test_commit one &&