diff options
Diffstat (limited to 'third_party/git/t/t7613-merge-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t7613-merge-submodule.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/third_party/git/t/t7613-merge-submodule.sh b/third_party/git/t/t7613-merge-submodule.sh new file mode 100755 index 000000000000..d1e9fcc781b9 --- /dev/null +++ b/third_party/git/t/t7613-merge-submodule.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +test_description='merge can handle submodules' + +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-submodule-update.sh + +# merges without conflicts +test_submodule_switch "git merge" + +test_submodule_switch "git merge --ff" + +test_submodule_switch "git merge --ff-only" + +KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 +KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 +test_submodule_switch "git merge --no-ff" + +test_done |