[PATCH] Correct show-diff output for deleted files

[git.git] / checkout-cache.c

diff --git a/checkout-cache.c b/checkout-cache.c
index cfbc47e..6ed8b69 100644 (file)
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -46,7 +46,7 @@ static void create_directories(const char *path)
                len = slash - path;
                memcpy(buf, path, len);
                buf[len] = 0;
-               mkdir(buf, 0700);
+               mkdir(buf, 0755);
        }
 }
 
@@ -96,12 +96,14 @@ static int write_entry(struct cache_entry *ce)
 
 static int checkout_entry(struct cache_entry *ce)
 {
-       if (!force) {
-               struct stat st;
+       struct stat st;
 
-               if (!stat(ce->name, &st)) {
-                       unsigned changed = cache_match_stat(ce, &st);
-                       if (changed && !quiet)
+       if (!stat(ce->name, &st)) {
+               unsigned changed = cache_match_stat(ce, &st);
+               if (!changed)
+                       return 0;
+               if (!force) {
+                       if (!quiet)
                                fprintf(stderr, "checkout-cache: %s already exists\n", ce->name);
                        return 0;
                }