Revert "fmt-merge-msg: stop treating `master` specially"
[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_DIRECTORY_SUBMODULE_CONFLICTS=1
9 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
10
11 test_submodule_switch_recursing_with_args "reset --keep"
12
13 test_submodule_forced_switch_recursing_with_args "reset --hard"
14
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