From 48294e1ddb4e31531d3025da0a6bed54cc4b72ac Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Sun, 15 Jun 2014 18:59:51 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t1013-read-tree-submodule.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 t/t1013-read-tree-submodule.sh 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 -- 2.11.4.GIT