aboutsummaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-04 14:57:06 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-04 14:57:06 -0700
commit391b4933442dd07507a5de112092eaa4efc902bb (patch)
treebae576a334e6e8941aa3997555b3c7e78aa4b242 /dir.c
parenta3402c18b66347a9357cdb1af5a581f1ecc5264d (diff)
parent0235017eafa8dfc3a7353b7091ad5109d0beb7a5 (diff)
downloadgit-391b4933442dd07507a5de112092eaa4efc902bb.tar.gz
git-391b4933442dd07507a5de112092eaa4efc902bb.tar.xz
Merge branch 'ar/clean-rmdir-empty' into maint
* ar/clean-rmdir-empty: clean: unreadable directory may still be rmdir-able if it is empty
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 325fb56ad..532bcb65b 100644
--- a/dir.c
+++ b/dir.c
@@ -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, '/');