The symlink case had never worked, and the file case was broken by the
O_EXCL change because the error return changed from EISDIR to EEXIST.
Fix both problems by just moving the test for an existing directory to a
more logical place.
die("cannot rmdir %s", path);
}
die("cannot rmdir %s", path);
}
-static int create_file(const char *path, unsigned int mode, int force)
+static int create_file(const char *path, unsigned int mode)
mode = (mode & 0100) ? 0777 : 0666;
mode = (mode & 0100) ? 0777 : 0666;
- fd = open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
- if (fd < 0) {
- if (errno == EISDIR && force) {
- remove_subtree(path);
- fd = open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
- }
- }
- return fd;
+ return open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
}
static int write_entry(struct cache_entry *ce, const char *path, struct checkout *state)
}
static int write_entry(struct cache_entry *ce, const char *path, struct checkout *state)
}
switch (ntohl(ce->ce_mode) & S_IFMT) {
case S_IFREG:
}
switch (ntohl(ce->ce_mode) & S_IFMT) {
case S_IFREG:
- fd = create_file(path, ntohl(ce->ce_mode), state->force);
+ fd = create_file(path, ntohl(ce->ce_mode));
if (fd < 0) {
free(new);
return error("git-checkout-cache: unable to create file %s (%s)",
if (fd < 0) {
free(new);
return error("git-checkout-cache: unable to create file %s (%s)",
* just do the right thing)
*/
unlink(path);
* just do the right thing)
*/
unlink(path);
+ if (S_ISDIR(st.st_mode)) {
+ if (!state->force)
+ return error("%s is a directory", path);
+ remove_subtree(path);
+ }
} else if (state->not_new)
return 0;
create_directories(path, state);
} else if (state->not_new)
return 0;
create_directories(path, state);