Add copyright notice of Rene Scharfe to tar-tree.c

[git.git] / merge-cache.c

diff --git a/merge-cache.c b/merge-cache.c
index 3aa391b..b2977cf 100644 (file)
--- a/merge-cache.c
+++ b/merge-cache.c
@@ -4,7 +4,8 @@
 #include "cache.h"
 
 static const char *pgm = NULL;
-static const char *arguments[5];
+static const char *arguments[8];
+static int err;
 
 static void run_program(void)
 {
@@ -18,34 +19,14 @@ static void run_program(void)
                            arguments[2],
                            arguments[3],
                            arguments[4],
+                           arguments[5],
+                           arguments[6],
+                           arguments[7],
                            NULL);
                die("unable to execute '%s'", pgm);
        }
        if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
-               die("merge program failed");
-}
-
-static char *create_temp_file(int stage, unsigned char *sha1)
-{
-       static char template[4][50];
-       char *path = template[stage];
-       void *buf;
-       char type[100];
-       unsigned long size;
-       int fd;
-
-       buf = read_sha1_file(sha1, type, &size);
-       if (!buf || strcmp(type, "blob"))
-               die("unable to read blob object %s", sha1_to_hex(sha1));
-
-       strcpy(path, ".merge_file_XXXXXX");
-       fd = mkstemp(path);
-       if (fd < 0)
-               die("unable to create temp-file");
-       if (write(fd, buf, size) != size)
-               die("unable to write temp-file");
-       close(fd);
-       return path;
+               err++;
 }
 
 static int merge_entry(int pos, const char *path)
@@ -59,15 +40,23 @@ static int merge_entry(int pos, const char *path)
        arguments[2] = "";
        arguments[3] = "";
        arguments[4] = path;
+       arguments[5] = "";
+       arguments[6] = "";
+       arguments[7] = "";
        found = 0;
        do {
+               static char hexbuf[4][60];
+               static char ownbuf[4][60];
                struct cache_entry *ce = active_cache[pos];
                int stage = ce_stage(ce);
 
                if (strcmp(ce->name, path))
                        break;
                found++;
-               arguments[stage] = create_temp_file(stage, ce->sha1);
+               strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
+               sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode) & (~S_IFMT));
+               arguments[stage] = hexbuf[stage];
+               arguments[stage + 4] = ownbuf[stage];
        } while (++pos < active_nr);
        if (!found)
                die("merge-cache: %s not in the cache", path);
@@ -123,5 +112,7 @@ int main(int argc, char **argv)
                }
                merge_file(arg);
        }
+       if (err)
+               die("merge program failed");
        return 0;
 }