Steal -t option to git-ls-files from Cogito fork.

[git.git] / checkout-cache.c

diff --git a/checkout-cache.c b/checkout-cache.c
index f65be62..244ebd1 100644 (file)
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -34,12 +34,12 @@
  */
 #include "cache.h"
 
-static int force = 0, quiet = 0;
+static int force = 0, quiet = 0, not_new = 0;
 
 static void create_directories(const char *path)
 {
        int len = strlen(path);
-       char *buf = malloc(len + 1);
+       char *buf = xmalloc(len + 1);
        const char *slash = path;
 
        while ((slash = strchr(slash+1, '/')) != NULL) {
@@ -72,23 +72,42 @@ static int write_entry(struct cache_entry *ce, const char *path)
        unsigned long size;
        long wrote;
        char type[20];
+       char target[1024];
 
        new = read_sha1_file(ce->sha1, type, &size);
        if (!new || strcmp(type, "blob")) {
                return error("checkout-cache: unable to read sha1 file of %s (%s)",
                        path, sha1_to_hex(ce->sha1));
        }
-       fd = create_file(path, ntohl(ce->ce_mode));
-       if (fd < 0) {
+       switch (ntohl(ce->ce_mode) & S_IFMT) {
+       case S_IFREG:
+               fd = create_file(path, ntohl(ce->ce_mode));
+               if (fd < 0) {
+                       free(new);
+                       return error("checkout-cache: unable to create file %s (%s)",
+                               path, strerror(errno));
+               }
+               wrote = write(fd, new, size);
+               close(fd);
+               free(new);
+               if (wrote != size)
+                       return error("checkout-cache: unable to write file %s", path);
+               break;
+       case S_IFLNK:
+               memcpy(target, new, size);
+               target[size] = '\0';
+               create_directories(path);
+               if (symlink(target, path)) {
+                       free(new);
+                       return error("checkout-cache: unable to create symlink %s (%s)",
+                               path, strerror(errno));
+               }
                free(new);
-               return error("checkout-cache: unable to create %s (%s)",
-                       path, strerror(errno));
+               break;
+       default:
+               free(new);
+               return error("checkout-cache: unknown file mode for %s", path);
        }
-       wrote = write(fd, new, size);
-       close(fd);
-       free(new);
-       if (wrote != size)
-               return error("checkout-cache: unable to write %s", path);
        return 0;
 }
 
@@ -101,7 +120,7 @@ static int checkout_entry(struct cache_entry *ce, const char *base_dir)
        memcpy(path, base_dir, len);
        strcpy(path + len, ce->name);
 
-       if (!stat(path, &st)) {
+       if (!lstat(path, &st)) {
                unsigned changed = cache_match_stat(ce, &st);
                if (!changed)
                        return 0;
@@ -118,7 +137,8 @@ static int checkout_entry(struct cache_entry *ce, const char *base_dir)
                 * just do the right thing)
                 */
                unlink(path);
-       }
+       } else if (not_new) 
+               return 0;
        return write_entry(ce, path);
 }
 
@@ -182,6 +202,10 @@ int main(int argc, char **argv)
                                quiet = 1;
                                continue;
                        }
+                       if (!strcmp(arg, "-n")) {
+                               not_new = 1;
+                               continue;
+                       }
                        if (!memcmp(arg, "--prefix=", 9)) {
                                base_dir = arg+9;
                                continue;