diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-06-11 09:54:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 09:54:04 +0100 |
| commit | d2c4f7645cab7d9ce0261d03cd7b5226cab90b63 (patch) | |
| tree | 4f1ce4e4889a5002870b431c151efbc7498261f9 /src/fileops.c | |
| parent | e476d5288cd8195063f775418efd7b7154880beb (diff) | |
| parent | 4a0df574114f331a2428278c5f72aae7a49fa214 (diff) | |
| download | libgit2-d2c4f7645cab7d9ce0261d03cd7b5226cab90b63.tar.gz | |
Merge pull request #4260 from libgit2/ethomson/forced_checkout_2
Update to forced checkout and untracked files
Diffstat (limited to 'src/fileops.c')
| -rw-r--r-- | src/fileops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/fileops.c b/src/fileops.c index bda17f02d..2f3f58d4f 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -770,6 +770,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 { |