summaryrefslogtreecommitdiff
path: root/t/t7112-reset-submodule.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t7112-reset-submodule.sh')
-rwxr-xr-xt/t7112-reset-submodule.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index 2eda6adeb1..a1cb9ff858 100755
--- a/t/t7112-reset-submodule.sh
+++ b/t/t7112-reset-submodule.sh
@@ -5,6 +5,14 @@ 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
+
+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 "git reset --merge"