undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'

Browse Source 
* pc/uninteresting-submodule-disappear-upon-switch-branches:
  Remove empty directories when checking out a commit with fewer submodules
This commit is contained in:
Junio C Hamano 2010-01-18 18:12:57 -08:00
commit 26b9f5cc99
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
t/t7400-submodule-basic.sh
View File

@ -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' ' test_expect_success 'submodule <invalid-path> warns' '
git submodule no-such-submodule 2> output.err && git submodule no-such-submodule 2> output.err &&

12
unpack-trees.c
View File

@ -67,8 +67,16 @@ static void unlink_entry(struct cache_entry *ce)
{ {
if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce))) if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
return; return;
if (unlink_or_warn(ce->name)) if (S_ISGITLINK(ce->ce_mode)) {
return; if (rmdir(ce->name)) {
warning("unable to rmdir %s: %s",
ce->name, strerror(errno));
return;
}
}
else
if (unlink_or_warn(ce->name))
return;
schedule_dir_for_removal(ce->name, ce_namelen(ce)); schedule_dir_for_removal(ce->name, ce_namelen(ce));
} }