[thirdparty/git.git] / t / t7613-merge-submodule.sh

#!/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
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
	9	test_submodule_switch "git merge"
	10
	11	test_submodule_switch "git merge --ff"
	12
	13	test_submodule_switch "git merge --ff-only"
	14
	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"
	18
	19	test_done