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

Remove empty directories after read-tree -u.

Browse Source 
This fixes everybody's favorite gripe that switching branche with
'git checkout' leaves empty directories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-10 17:34:08 -07:00
parent 17712991a5
commit 340e4f88c0
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
read-tree.c
View File

@ -237,6 +237,35 @@ static void reject_merge(struct cache_entry *ce)
ce->name);
}
/* Unlink the last component and attempt to remove leading
* directories, in case this unlink is the removal of the
* last entry in the directory -- empty directories are removed.
*/
static void unlink_entry(char *name)
{
char *cp, *prev;
if (unlink(name))
return;
prev = NULL;
while (1) {
int status;
cp = strrchr(name, '/');
if (prev)
*prev = '/';
if (!cp)
break;
*cp = 0;
status = rmdir(name);
if (status) {
*cp = '/';
break;
}
prev = cp;
}
}
static void check_updates(struct cache_entry **src, int nr)
{
static struct checkout state = {
@ -250,7 +279,7 @@ static void check_updates(struct cache_entry **src, int nr)
struct cache_entry *ce = *src++;
if (!ce->ce_mode) {
if (update)
unlink(ce->name);
unlink_entry(ce->name);
continue;
}
if (ce->ce_flags & mask) {