diff options
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index c903146..9727442 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1732,9 +1732,14 @@ static int check_patch(struct patch *patch) if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0) return error("%s: already exists in index", new_name); if (!cached) { - if (!lstat(new_name, &st)) - return error("%s: already exists in working directory", new_name); - if (errno != ENOENT) + struct stat nst; + if (!lstat(new_name, &nst)) { + if (S_ISDIR(nst.st_mode)) + ; /* ok */ + else + return error("%s: already exists in working directory", new_name); + } + else if ((errno != ENOENT) && (errno != ENOTDIR)) return error("%s: %s", new_name, strerror(errno)); } if (!patch->new_mode) { @@ -2011,6 +2016,16 @@ static void create_one_file(char *path, unsigned mode, const char *buf, unsigned } if (errno == EEXIST) { + /* We may be trying to create a file where a directory + * used to be. + */ + struct stat st; + errno = 0; + if (!lstat(path, &st) && S_ISDIR(st.st_mode) && !rmdir(path)) + errno = EEXIST; + } + + if (errno == EEXIST) { unsigned int nr = getpid(); for (;;) { |