diff options
Diffstat (limited to 'third_party/git/t/t7112-reset-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t7112-reset-submodule.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/git/t/t7112-reset-submodule.sh b/third_party/git/t/t7112-reset-submodule.sh index a1cb9ff858..19830d9036 100755 --- a/third_party/git/t/t7112-reset-submodule.sh +++ b/third_party/git/t/t7112-reset-submodule.sh @@ -5,7 +5,6 @@ test_description='reset can handle submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-submodule-update.sh -KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1 @@ -13,10 +12,10 @@ test_submodule_switch_recursing_with_args "reset --keep" test_submodule_forced_switch_recursing_with_args "reset --hard" -test_submodule_switch "git reset --keep" +test_submodule_switch "reset --keep" -test_submodule_switch "git reset --merge" +test_submodule_switch "reset --merge" -test_submodule_forced_switch "git reset --hard" +test_submodule_forced_switch "reset --hard" test_done |