Merge branch 'dd/t5703-grep-a-fix'
[git.git] / t / t7112-reset-submodule.sh
blob67346424a53960c33becefe865ad8881c1f1777e
1 #!/bin/sh
3 test_description='reset can handle submodules'
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
9 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
11 test_submodule_switch_recursing_with_args "reset --keep"
13 test_submodule_forced_switch_recursing_with_args "reset --hard"
15 test_submodule_switch "git reset --keep"
17 test_submodule_switch "git reset --merge"
19 test_submodule_forced_switch "git reset --hard"
21 test_done