mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/clean-rmdir-empty'

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-04-27 11:36:41 -07:00
commit 1de0746d84
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); dir = opendir(path->buf);
if (!dir) if (!dir)
return -1; return rmdir(path->buf);
if (path->buf[original_len - 1] != '/') if (path->buf[original_len - 1] != '/')
strbuf_addch(path, '/'); 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 test_done