development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ar/clean-rmdir-empty' into maint

Browse source 
* ar/clean-rmdir-empty:
  clean: unreadable directory may still be rmdir-able if it is empty
This commit is contained in:
Junio C Hamano 2011-05-04 14:57:06 -07:00
parent a3402c18b6 0235017eaf
commit 391b493344
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dir.c
View file

@ -1192,7 +1192,7 @@ int remove_dir_recursively(struct strbuf *path, int flag)
dir = opendir(path->buf);
if (!dir)
return -1;
return rmdir(path->buf);
if (path->buf[original_len - 1] != '/')
strbuf_addch(path, '/');

7
t/t7300-clean.sh
View file

@ -453,4 +453,11 @@ test_expect_success 'git clean -e' '
)
'
test_expect_success SANITY 'git clean -d with an unreadable empty directory' '
mkdir foo &&
chmod a= foo &&
git clean -dfx foo &&
! test -d foo
'
test_done