diff options
Diffstat (limited to 'third_party/git/t/t4137-apply-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t4137-apply-submodule.sh | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/third_party/git/t/t4137-apply-submodule.sh b/third_party/git/t/t4137-apply-submodule.sh deleted file mode 100755 index 07d52625375d..000000000000 --- a/third_party/git/t/t4137-apply-submodule.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -test_description='git apply handling submodules' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-submodule-update.sh - -apply_index () { - git diff --ignore-submodules=dirty "..$1" >diff && - may_only_be_test_must_fail "$2" && - $2 git apply --index diff -} - -test_submodule_switch_func "apply_index" - -apply_3way () { - git diff --ignore-submodules=dirty "..$1" >diff && - may_only_be_test_must_fail "$2" && - $2 git apply --3way diff -} - -test_submodule_switch_func "apply_3way" - -test_done |