diff options
Diffstat (limited to 'third_party/git/t/t4137-apply-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t4137-apply-submodule.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/git/t/t4137-apply-submodule.sh b/third_party/git/t/t4137-apply-submodule.sh index a9bd40a6d0..07d5262537 100755 --- a/third_party/git/t/t4137-apply-submodule.sh +++ b/third_party/git/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 |