From 8ef85694a5f45dd22ea9d433066dcfad6b7ab73f Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Sun, 15 Jun 2014 19:00:28 +0200 Subject: [PATCH] reset: add t7112 for submodule updates Test that the reset command updates the work tree as expected for changes with '--keep', '--merge' (for changes which don't result in conflicts) and '--hard'. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t7112-reset-submodule.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 t/t7112-reset-submodule.sh diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh new file mode 100755 index 0000000000..2eda6adeb1 --- /dev/null +++ b/t/t7112-reset-submodule.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +test_description='reset can handle submodules' + +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-submodule-update.sh + +test_submodule_switch "git reset --keep" + +test_submodule_switch "git reset --merge" + +test_submodule_forced_switch "git reset --hard" + +test_done -- 2.11.4.GIT