t7112-reset-submodule.sh 531 字节
Newer Older
1 2 3 4 5 6 7
#!/bin/sh

test_description='reset can handle submodules'

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

8 9 10 11
KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1

12
test_submodule_switch_recursing_with_args "reset --keep"
13

14
test_submodule_forced_switch_recursing_with_args "reset --hard"
15

16 17 18 19 20 21 22
test_submodule_switch "git reset --keep"

test_submodule_switch "git reset --merge"

test_submodule_forced_switch "git reset --hard"

test_done