Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Cleanup and consolidation of rename_conflict_info
[gitweb.git]
/
dir.c
diff --git
a/dir.c
b/dir.c
index 325fb56ad395c9b47dcbdea47b2833a4287198bc..532bcb65b523223b66efd3f4e458f62fcbe0d6a5 100644
(file)
--- 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, '/');