diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 23:57:06 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 23:57:06 +0200 |
commit | 391b4933442dd07507a5de112092eaa4efc902bb (patch) | |
tree | bae576a334e6e8941aa3997555b3c7e78aa4b242 /dir.c | |
parent | Merge branch 'mg/sha1-path-advise' into maint (diff) | |
parent | clean: unreadable directory may still be rmdir-able if it is empty (diff) | |
download | git-391b4933442dd07507a5de112092eaa4efc902bb.tar.xz git-391b4933442dd07507a5de112092eaa4efc902bb.zip |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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, '/'); |