[thirdparty/git.git] / t / t7112-reset-submodule.sh

#!/bin/sh

test_description='reset can handle submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh

KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1

test_submodule_switch_recursing_with_args "reset --keep"

test_submodule_forced_switch_recursing_with_args "reset --hard"

test_submodule_switch "git reset --keep"

test_submodule_switch "git reset --merge"

test_submodule_forced_switch "git reset --hard"

test_done
Commit	Line	Data
8ef85694 JL	1	#!/bin/sh
	2
	3	test_description='reset can handle submodules'
	4
	5	. ./test-lib.sh
	6	. "$TEST_DIRECTORY"/lib-submodule-update.sh
	7
35b96d1d SB	8	KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
	9	KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
	10
17f38cb7	11	test_submodule_switch_recursing_with_args "reset --keep"
35b96d1d	12
17f38cb7	13	test_submodule_forced_switch_recursing_with_args "reset --hard"
35b96d1d	14
8ef85694 JL	15	test_submodule_switch "git reset --keep"
	16
	17	test_submodule_switch "git reset --merge"
	18
	19	test_submodule_forced_switch "git reset --hard"
	20
	21	test_done