3 test_description='merge can handle submodules'
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 # merges without conflicts
9 test_submodule_switch "git merge"
11 test_submodule_switch "git merge --ff"
13 test_submodule_switch "git merge --ff-only"
15 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
16 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
17 test_submodule_switch "git merge --no-ff"