[thirdparty/git.git] / t / t6438-submodule-directory-file-conflicts.sh

#!/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"

KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "merge --no-ff"

test_done
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 JL	14
	15	KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
	16	KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
aa06180a	17	test_submodule_switch "merge --no-ff"
663ed39a JL	18
663ed39a JL	19	test_done