mirror of
https://github.com/git/git.git
synced 2024-11-18 22:53:55 +01:00
20 lines
450 B
Bash
20 lines
450 B
Bash
|
#!/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
|