Merge branch 'dl/format-patch-cover-from-desc'
[git.git] / t / t7112-reset-submodule.sh
bloba1cb9ff858e4a2113bbf7fb732b9e6d0cb308445
1 #!/bin/sh
3 test_description='reset can handle submodules'
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
9 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
10 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
12 test_submodule_switch_recursing_with_args "reset --keep"
14 test_submodule_forced_switch_recursing_with_args "reset --hard"
16 test_submodule_switch "git reset --keep"
18 test_submodule_switch "git reset --merge"
20 test_submodule_forced_switch "git reset --hard"
22 test_done