Make "git prune" use the "--full" flag to git-fsck-cache

diff --git a/entry.c b/entry.c
index 874516e174d0704808587689504b9ba84f2dc9af..792ea733e851a3d288cad1e34ea89478503e71be 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -12,10 +12,10 @@ static void create_directories(const char *path, struct checkout *state)
                len = slash - path;
                memcpy(buf, path, len);
                buf[len] = 0;
-               if (mkdir(buf, 0755)) {
+               if (mkdir(buf, 0777)) {
                        if (errno == EEXIST) {
                                struct stat st;
-                               if (len > state->base_dir_len && state->force && !unlink(buf) && !mkdir(buf, 0755))
+                               if (len > state->base_dir_len && state->force && !unlink(buf) && !mkdir(buf, 0777))
                                        continue;
                                if (!stat(buf, &st) && S_ISDIR(st.st_mode))
                                        continue; /* ok */
@@ -62,11 +62,11 @@ static int create_file(const char *path, unsigned int mode, int force)
        int fd;
 
        mode = (mode & 0100) ? 0777 : 0666;
-       fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
+       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, mode);
+                       fd = open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
                }
        }
        return fd;