summaryrefslogtreecommitdiffstats
path: root/t/t4137-apply-submodule.sh
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xt/t4137-apply-submodule.sh24
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh
new file mode 100755
index 0000000..07d5262
--- /dev/null
+++ b/t/t4137-apply-submodule.sh
@@ -0,0 +1,24 @@
+#!/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