Fix up git-export to use the lower-level interfaces for diff generation.

diff --git a/checkout-cache.c b/checkout-cache.c
index 09b36b9c77e5ed3b833f7ede502640a966373f49..5cd473ca1ca8cf5ced71be70e6ed76a484575b08 100644 (file)
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -54,7 +54,7 @@ static int create_file(const char *path, unsigned int mode)
 {
        int fd;
 
-       mode = (mode & 0100) ? 777 : 666;
+       mode = (mode & 0100) ? 0777 : 0666;
        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
        if (fd < 0) {
                if (errno == ENOENT) {
@@ -62,8 +62,6 @@ static int create_file(const char *path, unsigned int mode)
                        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
                }
        }
-       if (fd >= 0)
-               fchmod(fd, mode);
        return fd;
 }
 
@@ -123,8 +121,15 @@ static int checkout_file(const char *name)
 {
        int pos = cache_name_pos(name, strlen(name));
        if (pos < 0) {
-               if (!quiet)
-                       fprintf(stderr, "checkout-cache: %s is not in the cache\n", name);
+               if (!quiet) {
+                       pos = -pos - 1;
+                       fprintf(stderr,
+                               "checkout-cache: %s is %s.\n",
+                               name,
+                               (pos < active_nr &&
+                                !strcmp(active_cache[pos]->name, name)) ?
+                               "unmerged" : "not in the cache");
+               }
                return -1;
        }
        return checkout_entry(active_cache[pos]);
@@ -136,6 +141,8 @@ static int checkout_all(void)
 
        for (i = 0; i < active_nr ; i++) {
                struct cache_entry *ce = active_cache[i];
+               if (ce_stage(ce))
+                       continue;
                if (checkout_entry(ce) < 0)
                        return -1;
        }