From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- t/t7112-reset-submodule.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 t/t7112-reset-submodule.sh (limited to 't/t7112-reset-submodule.sh') diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh new file mode 100755 index 0000000..a3e2413 --- /dev/null +++ b/t/t7112-reset-submodule.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +test_description='reset can handle submodules' + +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-submodule-update.sh + +KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 + +test_submodule_switch_recursing_with_args "reset --keep" + +test_submodule_forced_switch_recursing_with_args "reset --hard" + +test_submodule_switch "reset --keep" + +test_submodule_switch "reset --merge" + +test_submodule_forced_switch "reset --hard" + +test_done -- cgit v1.2.3