diff options
| author | Vicent Martà <vicent@github.com> | 2013-05-06 06:33:02 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-05-06 06:33:02 -0700 |
| commit | 450a78bf07b0c255df72279d41e04270e453e2cc (patch) | |
| tree | 5e7b3485f0de1632948996eee1f2ed45ad7db20a /src/fileops.c | |
| parent | 0ed3fa8a37f6dc2e59eeabb44e4df7660ee856bf (diff) | |
| parent | e09d18eed66d0239bea73af51e586f6ae651fe49 (diff) | |
| download | libgit2-450a78bf07b0c255df72279d41e04270e453e2cc.tar.gz | |
Merge pull request #1545 from ethomson/checkout_dirs_in_use
allow checkout to proceed when a dir to be removed is in use (win32)
Diffstat (limited to 'src/fileops.c')
| -rw-r--r-- | src/fileops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fileops.c b/src/fileops.c index d6244711f..36f601706 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -444,7 +444,7 @@ static int futils__rmdir_recurs_foreach(void *opaque, git_buf *path) if (data->error < 0) { if ((data->flags & GIT_RMDIR_SKIP_NONEMPTY) != 0 && - (errno == ENOTEMPTY || errno == EEXIST)) + (errno == ENOTEMPTY || errno == EEXIST || errno == EBUSY)) data->error = 0; else futils__error_cannot_rmdir(path->ptr, NULL); @@ -480,7 +480,7 @@ static int futils__rmdir_empty_parent(void *opaque, git_buf *path) if (en == ENOENT || en == ENOTDIR) { giterr_clear(); error = 0; - } else if (en == ENOTEMPTY || en == EEXIST) { + } else if (en == ENOTEMPTY || en == EEXIST || en == EBUSY) { giterr_clear(); error = GIT_ITEROVER; } else { |