From: Jens Lehmann <Jens.Lehmann@web.de>
Date: Sun, 15 Jun 2014 17:00:28 +0000 (+0200)
Subject: reset: add t7112 for submodule updates
X-Git-Tag: v2.1.0-rc0~23^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ef85694a5f45dd22ea9d433066dcfad6b7ab73f?ds=inline;hp=--cc

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 <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

8ef85694a5f45dd22ea9d433066dcfad6b7ab73f
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