From: Jens Lehmann <Jens.Lehmann@web.de>
Date: Sun, 15 Jun 2014 16:59:51 +0000 (+0200)
Subject: read-tree: add t1013 for submodule updates
X-Git-Tag: v2.1.0-rc0~23^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48294e1ddb4e31531d3025da0a6bed54cc4b72ac?ds=inline;hp=--cc

read-tree: add t1013 for submodule updates

Test that the read-tree command updates the work tree as expected for
changes which don't result in conflicts with the '-m' and '--reset' flag.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

48294e1ddb4e31531d3025da0a6bed54cc4b72ac
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
new file mode 100755
index 0000000000..20526aed34
--- /dev/null
+++ b/t/t1013-read-tree-submodule.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test_description='read-tree can handle submodules'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
+
+test_submodule_switch "git read-tree -u -m"
+
+test_submodule_forced_switch "git read-tree -u --reset"
+
+test_done