Merge branch 'js/misc-git-gui-stuff' of ../git-gui
[git] / t / t7112-reset-submodule.sh
1 #!/bin/sh
2
3 test_description='reset can handle submodules'
4
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
7
8 KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
9 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
10 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
11
12 test_submodule_switch_recursing_with_args "reset --keep"
13
14 test_submodule_forced_switch_recursing_with_args "reset --hard"
15
16 test_submodule_switch "git reset --keep"
17
18 test_submodule_switch "git reset --merge"
19
20 test_submodule_forced_switch "git reset --hard"
21
22 test_done