diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-02-19 01:31:42 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-19 01:31:42 -0800 |
commit | 50c19c777d7b219914b4149e9a465542e3cb5700 (patch) | |
tree | 8f324bd06f6c515dd28888a2e619917e3bcc2513 /dir.c | |
parent | Merge branch 'maint' (diff) | |
parent | Merge branch 'jk/maint-rmdir-fix' into maint (diff) | |
download | tgif-50c19c777d7b219914b4149e9a465542e3cb5700.tar.xz |
Merge branch 'maint'
* maint:
rm: fix bug in recursive subdirectory removal
Documentation: describe --thin more accurately
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1044,7 +1044,7 @@ int remove_path(const char *name) slash = dirs + (slash - name); do { *slash = '\0'; - } while (rmdir(dirs) && (slash = strrchr(dirs, '/'))); + } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/'))); free(dirs); } return 0; |