summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2014-06-15 16:58:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-14 19:06:15 (GMT)
commitd78ecca5206c65aff55573029b9fa2dd9c9cf4e1 (patch)
tree8f555d26a24887988ef3133d51d77254aec1f093 /t
parent42639d2317ac8b15aae3e28468b7c86e0eb89800 (diff)
downloadgit-d78ecca5206c65aff55573029b9fa2dd9c9cf4e1.zip
git-d78ecca5206c65aff55573029b9fa2dd9c9cf4e1.tar.gz
git-d78ecca5206c65aff55573029b9fa2dd9c9cf4e1.tar.bz2
checkout: call the new submodule update test framework
Test that the checkout command updates the work tree as expected with and without the '-f' flag. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t2013-checkout-submodule.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 06b18f8..6847f75 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -3,6 +3,7 @@
test_description='checkout can handle submodules'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
test_expect_success 'setup' '
mkdir submodule &&
@@ -62,4 +63,8 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/
! test -s actual
'
+test_submodule_switch "git checkout"
+
+test_submodule_forced_switch "git checkout -f"
+
test_done