From: Jens Lehmann Date: Sun, 15 Jun 2014 16:58:44 +0000 (+0200) Subject: checkout: call the new submodule update test framework X-Git-Tag: v2.1.0-rc0~23^2~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d78ecca5206c65aff55573029b9fa2dd9c9cf4e1?hp=--cc 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 Signed-off-by: Junio C Hamano --- d78ecca5206c65aff55573029b9fa2dd9c9cf4e1 diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 06b18f8bc1..6847f75822 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 " honors submodule.*.ignore from .git/ ! test -s actual ' +test_submodule_switch "git checkout" + +test_submodule_forced_switch "git checkout -f" + test_done