diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:18:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:18:31 -0700 |
| commit | ad25da009e2a37306d2d53a8462f036ef532b4ff (patch) | |
| tree | e6d71ce06709b09066f2dc80276e3f8ea0cda8d6 /t/t2013-checkout-submodule.sh | |
| parent | 3b3b61c5d5ef93a68e9af3c17eebc09c96b71d08 (diff) | |
| parent | 1621c99c79875d6537edc59b6c2b4c2038a97b20 (diff) | |
| download | git-ad25da009e2a37306d2d53a8462f036ef532b4ff.tar.gz | |
Merge branch 'jl/submodule-tests'
* jl/submodule-tests:
revert: add t3513 for submodule updates
stash: add t3906 for submodule updates
am: add t4255 for submodule updates
cherry-pick: add t3512 for submodule updates
pull: add t5572 for submodule updates
rebase: add t3426 for submodule updates
merge: add t7613 for submodule updates
bisect: add t6041 for submodule updates
reset: add t7112 for submodule updates
read-tree: add t1013 for submodule updates
apply: add t4137 for submodule updates
checkout: call the new submodule update test framework
submodules: add the lib-submodule-update.sh test library
test-lib: add test_dir_is_empty()
Diffstat (limited to 't/t2013-checkout-submodule.sh')
| -rwxr-xr-x | t/t2013-checkout-submodule.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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 <submodule>" honors submodule.*.ignore from .git/ ! test -s actual ' +test_submodule_switch "git checkout" + +test_submodule_forced_switch "git checkout -f" + test_done |