Re: "git-checkout-cache -f -a" failure
- From
Junio C Hamano <junkio@cox.net>
- Date
- May 11, 2005, 02:53 UTC
- Message-ID
- <7vpsvyv5gp.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7vr7gewuxt.fsf@assigned-by-dhcp.cox.net>
Please forget about the previous one which was buggy when you had ".something" file under the directory being replaced.
Could you give this patch a try?
---
Running git-checkout-cache -f -a to check out a file in a directory fails when the work tree has a non-directory with the same name as the directory being checked out. Similarly it fails to check out a file when the work tree has a directory with the same name as the file being checked out.
When '-f' is specified, the user is telling us that "I really want to match the work tree with what is in the cache." So removing the offending file or directory from the work tree to make room when necessary and possible in order to make the checkout succeed is the right thing to do.
Signed-off-by: Junio C Hamano <junkio@cox.net>
--- a/checkout-cache.c +++ b/checkout-cache.c @@ -32,6 +32,8 @@ * of "-a" causing problems (not possible in the above example, * but get used to it in scripting!). */ +#include <sys/types.h> +#include <dirent.h> #include "cache.h" static int force = 0, quiet = 0, not_new = 0; @@ -46,11 +48,51 @@ static void create_directories(const cha len = slash - path; memcpy(buf, path, len); buf[len] = 0; - mkdir(buf, 0755); + if (mkdir(buf, 0755)) { + if (errno == EEXIST) { + struct stat st; + if (!lstat(buf, &st) && S_ISDIR(st.st_mode)) + continue; /* ok */ + if (force && !unlink(buf) && !mkdir(buf, 0755)) + continue; + } + die("cannot create directory at %s", buf); + } } free(buf); } +static void remove_subtree(const char *path) +{ + DIR *dir = opendir(path); + struct dirent *de; + char pathbuf[PATH_MAX]; + char *name; + + if (!dir) + die("cannot opendir %s", path); + strcpy(pathbuf, path); + name = pathbuf + strlen(path); + *name++ = '/'; + while ((de = readdir(dir)) != NULL) { + struct stat st; + if ((de->d_name[0] == '.') && + ((de->d_name[1] == 0) || + (de->d_name[1] == '.') && de->d_name[2] == 0)) + continue; + strcpy(name, de->d_name); + if (lstat(pathbuf, &st)) + die("cannot lstat %s", pathbuf); + if (S_ISDIR(st.st_mode)) + remove_subtree(pathbuf); + else if (unlink(pathbuf)) + die("cannot unlink %s", pathbuf); + } + closedir(dir); + if (rmdir(path)) + die("cannot rmdir %s", path); +} + static int create_file(const char *path, unsigned int mode) { int fd; @@ -58,10 +100,14 @@ static int create_file(const char *path, mode = (mode & 0100) ? 0777 : 0666; fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); if (fd < 0) { - if (errno == ENOENT) { + if ((errno == ENOENT) || (errno == ENOTDIR && force)) { create_directories(path); fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); } + else if (errno == EISDIR && force) { + remove_subtree(path); + fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); + } } return fd; } ------------------------------------------------