about summary refs log tree commit diff
path: root/third_party/git/t/t4137-apply-submodule.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t4137-apply-submodule.sh')
-rwxr-xr-xthird_party/git/t/t4137-apply-submodule.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/third_party/git/t/t4137-apply-submodule.sh b/third_party/git/t/t4137-apply-submodule.sh
new file mode 100755
index 000000000000..a9bd40a6d043
--- /dev/null
+++ b/third_party/git/t/t4137-apply-submodule.sh
@@ -0,0 +1,20 @@
+#!/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" | git apply --index -
+}
+
+test_submodule_switch "apply_index"
+
+apply_3way () {
+	git diff --ignore-submodules=dirty "..$1" | git apply --3way -
+}
+
+test_submodule_switch "apply_3way"
+
+test_done