summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6438-submodule-directory-file-conflicts.sh')
-rwxr-xr-xt/t6438-submodule-directory-file-conflicts.sh22
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t6438-submodule-directory-file-conflicts.sh b/t/t6438-submodule-directory-file-conflicts.sh
new file mode 100755
index 0000000..8df67a0
--- /dev/null
+++ b/t/t6438-submodule-directory-file-conflicts.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+test_description='merge can handle submodules'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
+
+# merges without conflicts
+test_submodule_switch "merge"
+
+test_submodule_switch "merge --ff"
+
+test_submodule_switch "merge --ff-only"
+
+if test "$GIT_TEST_MERGE_ALGORITHM" != ort
+then
+ KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
+ KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
+fi
+test_submodule_switch "merge --no-ff"
+
+test_done