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

[thirdparty/git.git] / t / t4137-apply-submodule.sh

diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh
index a9bd40a6d04398234fafb1dda919872a0a33591d..07d52625375d4bec97db0a14d74a4fd154681b5e 100755 (executable)
--- a/t/t4137-apply-submodule.sh
+++ b/t/t4137-apply-submodule.sh
@@ -6,15 +6,19 @@ test_description='git apply handling submodules'
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
 apply_index () {
-       git diff --ignore-submodules=dirty "..$1" | git apply --index -
+       git diff --ignore-submodules=dirty "..$1" >diff &&
+       may_only_be_test_must_fail "$2" &&
+       $2 git apply --index diff
 }
 
-test_submodule_switch "apply_index"
+test_submodule_switch_func "apply_index"
 
 apply_3way () {
-       git diff --ignore-submodules=dirty "..$1" | git apply --3way -
+       git diff --ignore-submodules=dirty "..$1" >diff &&
+       may_only_be_test_must_fail "$2" &&
+       $2 git apply --3way diff
 }
 
-test_submodule_switch "apply_3way"
+test_submodule_switch_func "apply_3way"
 
 test_done