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/t1013-read-tree-submodule.sh | |
| parent | Merge branch 'ak/profile-feedback-build' (diff) | |
| parent | revert: add t3513 for submodule updates (diff) | |
| download | tgif-ad25da009e2a37306d2d53a8462f036ef532b4ff.tar.xz | |
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/t1013-read-tree-submodule.sh')
| -rwxr-xr-x | t/t1013-read-tree-submodule.sh | 12 |
1 files changed, 12 insertions, 0 deletions
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 |