git_futils_rmdir: only allow `EBUSY` when asked

Only ignore `EBUSY` from `rmdir` when the `GIT_RMDIR_SKIP_NONEMPTY` bit
is set.

diff --git a/src/fileops.c b/src/fileops.c
index f9552a5f828b1b999da6a11c87cc113148af209c..2f86ba1e480203088db25fafd5a36ff64eb54392 100644 (file)
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -766,6 +766,9 @@ static int futils__rmdir_empty_parent(void *opaque, const char *path)
 
                if (en == ENOENT || en == ENOTDIR) {
                        /* do nothing */
+               } else if ((data->flags & GIT_RMDIR_SKIP_NONEMPTY) == 0 &&
+                       en == EBUSY) {
+                       error = git_path_set_error(errno, path, "rmdir");
                } else if (en == ENOTEMPTY || en == EEXIST || en == EBUSY) {
                        error = GIT_ITEROVER;
                } else {