builtin-diff: call it "git-diff", really.

diff --git a/entry.c b/entry.c
index 6c47c3a3e1acb8badaadad42dfe3d0bd7a06cac3..793724fd52063157545f523f6d88953b96385c2c 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -1,6 +1,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include "cache.h"
+#include "blob.h"
 
 static void create_directories(const char *path, struct checkout *state)
 {
@@ -63,7 +64,7 @@ static int create_file(const char *path, unsigned int mode)
        return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
 }
 
-static int write_entry(struct cache_entry *ce, const char *path, struct checkout *state)
+static int write_entry(struct cache_entry *ce, char *path, struct checkout *state, int to_tempfile)
 {
        int fd;
        void *new;
@@ -72,7 +73,7 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
        char type[20];
 
        new = read_sha1_file(ce->sha1, type, &size);
-       if (!new || strcmp(type, "blob")) {
+       if (!new || strcmp(type, blob_type)) {
                if (new)
                        free(new);
                return error("git-checkout-index: unable to read sha1 file of %s (%s)",
@@ -80,7 +81,11 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
        }
        switch (ntohl(ce->ce_mode) & S_IFMT) {
        case S_IFREG:
-               fd = create_file(path, ntohl(ce->ce_mode));
+               if (to_tempfile) {
+                       strcpy(path, ".merge_file_XXXXXX");
+                       fd = mkstemp(path);
+               } else
+                       fd = create_file(path, ntohl(ce->ce_mode));
                if (fd < 0) {
                        free(new);
                        return error("git-checkout-index: unable to create file %s (%s)",
@@ -93,12 +98,27 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
                        return error("git-checkout-index: unable to write file %s", path);
                break;
        case S_IFLNK:
-               if (symlink(new, path)) {
+               if (to_tempfile) {
+                       strcpy(path, ".merge_link_XXXXXX");
+                       fd = mkstemp(path);
+                       if (fd < 0) {
+                               free(new);
+                               return error("git-checkout-index: unable to create "
+                                                "file %s (%s)", path, strerror(errno));
+                       }
+                       wrote = write(fd, new, size);
+                       close(fd);
+                       free(new);
+                       if (wrote != size)
+                               return error("git-checkout-index: unable to write file %s",
+                                       path);
+               } else {
+                       wrote = symlink(new, path);
                        free(new);
-                       return error("git-checkout-index: unable to create "
-                                    "symlink %s (%s)", path, strerror(errno));
+                       if (wrote)
+                               return error("git-checkout-index: unable to create "
+                                                "symlink %s (%s)", path, strerror(errno));
                }
-               free(new);
                break;
        default:
                free(new);
@@ -113,17 +133,20 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
        return 0;
 }
 
-int checkout_entry(struct cache_entry *ce, struct checkout *state)
+int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath)
 {
-       struct stat st;
        static char path[MAXPATHLEN+1];
+       struct stat st;
        int len = state->base_dir_len;
 
+       if (topath)
+               return write_entry(ce, topath, state, 1);
+
        memcpy(path, state->base_dir, len);
        strcpy(path + len, ce->name);
 
        if (!lstat(path, &st)) {
-               unsigned changed = ce_match_stat(ce, &st);
+               unsigned changed = ce_match_stat(ce, &st, 1);
                if (!changed)
                        return 0;
                if (!state->force) {
@@ -144,10 +167,10 @@ int checkout_entry(struct cache_entry *ce, struct checkout *state)
                                return error("%s is a directory", path);
                        remove_subtree(path);
                }
-       } else if (state->not_new) 
+       } else if (state->not_new)
                return 0;
        create_directories(path, state);
-       return write_entry(ce, path, state);
+       return write_entry(ce, path, state, 0);
 }