On Fri, Apr 1, 2011 at 00:01, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> Now, I realize that if the directory isn't empty, and is unreadable,
> we really should give up (although a better error message about _why_
> we failed may be in order) rather than try to chmod it or anything
> like that. But the simple "try to rmdir it" might be a good addition
> for the trivial case.
Something like this?
diff --git a/dir.c b/dir.c
index 325fb56..7251426 100644
--- a/dir.c
+++ b/dir.c
@@ -1191,8 +1191,11 @@ int remove_dir_recursively(struct strbuf *path, int flag)
return 0;
dir = opendir(path->buf);
- if (!dir)
+ if (!dir) {
+ if (rmdir(path->buf) == 0)
+ return 0;
return -1;
+ }
if (path->buf[original_len - 1] != '/')
strbuf_addch(path, '/');
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html