]>
Commit | Line | Data |
---|---|---|
663ed39a JL |
1 | #!/bin/sh |
2 | ||
3 | test_description='merge can handle submodules' | |
4 | ||
5 | . ./test-lib.sh | |
6 | . "$TEST_DIRECTORY"/lib-submodule-update.sh | |
7 | ||
8 | # merges without conflicts | |
aa06180a | 9 | test_submodule_switch "merge" |
663ed39a | 10 | |
aa06180a | 11 | test_submodule_switch "merge --ff" |
663ed39a | 12 | |
aa06180a | 13 | test_submodule_switch "merge --ff-only" |
663ed39a | 14 | |
aa2faac0 EN |
15 | if test "$GIT_TEST_MERGE_ALGORITHM" != ort |
16 | then | |
17 | KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 | |
18 | KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 | |
19 | fi | |
aa06180a | 20 | test_submodule_switch "merge --no-ff" |
663ed39a JL |
21 | |
22 | test_done |