summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-14 16:58:45 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-14 16:58:45 (GMT)
commitd48a72f337fa8edfb7a09e620e75cbbb2a5fe836 (patch)
tree9a8151ea125e529ed6a5550e465ea579cc13a6c2 /entry.c
parentd1918a728574a627e2a9e0dfc087cfd58e9d8acd (diff)
downloadgit-d48a72f337fa8edfb7a09e620e75cbbb2a5fe836.zip
git-d48a72f337fa8edfb7a09e620e75cbbb2a5fe836.tar.gz
git-d48a72f337fa8edfb7a09e620e75cbbb2a5fe836.tar.bz2
Fix replacing of a directory with a file/symlink in git-checkout-cache
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.
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/entry.c b/entry.c
index 792ea73..15b8fda 100644
--- a/entry.c
+++ b/entry.c
@@ -57,19 +57,10 @@ static void remove_subtree(const char *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)
{
- int fd;
-
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)
@@ -90,7 +81,7 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
}
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)",
@@ -151,6 +142,11 @@ int checkout_entry(struct cache_entry *ce, struct checkout *state)
* 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);