diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:12:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:12:57 -0800 |
| commit | 26b9f5cc99a35d4f678c2f565e48237fc9515444 (patch) | |
| tree | 52775c8cb6e23c620adb84f6f34186085a41d8d9 /t | |
| parent | 243157506725befcf7c7ed7e79ca4708b63f3a65 (diff) | |
| parent | c5e558a80ad27774b9984258a31fbf46a1d7c152 (diff) | |
| download | git-26b9f5cc99a35d4f678c2f565e48237fc9515444.tar.gz | |
Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'
* pc/uninteresting-submodule-disappear-upon-switch-branches:
Remove empty directories when checking out a commit with fewer submodules
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index a0cc99ab9f..1a4dc5f893 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -299,6 +299,15 @@ test_expect_success 'ls-files gracefully handles trailing slash' ' ' +test_expect_success 'moving to a commit without submodule does not leave empty dir' ' + rm -rf init && + mkdir init && + git reset --hard && + git checkout initial && + test ! -d init && + git checkout second +' + test_expect_success 'submodule <invalid-path> warns' ' git submodule no-such-submodule 2> output.err && |