t/t6438-submodule-directory-file-conflicts.sh


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
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