[PATCH] Use a temporary index file when we merge the common ancestors.

diff --git a/fetch-pack.c b/fetch-pack.c
index ec5bad89cdb3f6eae038877856f2eefb1125bf6f..582f967a7af68670a6bb174745e43df35a2d0eef 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -3,10 +3,14 @@
 #include "pkt-line.h"
 #include <sys/wait.h>
 
-static const char fetch_pack_usage[] = "git-fetch-pack [host:]directory [heads]* < mycommitlist";
+static int quiet;
+static int verbose;
+static const char fetch_pack_usage[] =
+"git-fetch-pack [-q] [-v] [--exec=upload-pack] [host:]directory <refs>...";
 static const char *exec = "git-upload-pack";
 
-static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *remote)
+static int find_common(int fd[2], unsigned char *result_sha1,
+                      struct ref *refs)
 {
        static char line[1000];
        int count = 0, flushes = 0, retval;
@@ -15,7 +19,16 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem
        revs = popen("git-rev-list $(git-rev-parse --all)", "r");
        if (!revs)
                die("unable to run 'git-rev-list'");
-       packet_write(fd[1], "want %s\n", sha1_to_hex(remote));
+
+       while (refs) {
+               unsigned char *remote = refs->old_sha1;
+               if (verbose)
+                       fprintf(stderr,
+                               "want %s (%s)\n", sha1_to_hex(remote),
+                               refs->name);
+               packet_write(fd[1], "want %s\n", sha1_to_hex(remote));
+               refs = refs->next;
+       }
        packet_flush(fd[1]);
        flushes = 1;
        retval = -1;
@@ -24,6 +37,8 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem
                if (get_sha1_hex(line, sha1))
                        die("git-fetch-pack: expected object name, got crud");
                packet_write(fd[1], "have %s\n", sha1_to_hex(sha1));
+               if (verbose)
+                       fprintf(stderr, "have %s\n", sha1_to_hex(sha1));
                if (!(31 & ++count)) {
                        packet_flush(fd[1]);
                        flushes++;
@@ -37,6 +52,8 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem
                        if (get_ack(fd[0], result_sha1)) {
                                flushes = 0;
                                retval = 0;
+                               if (verbose)
+                                       fprintf(stderr, "got ack\n");
                                break;
                        }
                        flushes--;
@@ -44,61 +61,42 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem
        }
        pclose(revs);
        packet_write(fd[1], "done\n");
+       if (verbose)
+               fprintf(stderr, "done\n");
        while (flushes) {
                flushes--;
-               if (get_ack(fd[0], result_sha1))
+               if (get_ack(fd[0], result_sha1)) {
+                       if (verbose)
+                               fprintf(stderr, "got ack\n");
                        return 0;
+               }
        }
        return retval;
 }
 
-static int get_remote_heads(int fd, int nr_match, char **match, unsigned char *result)
-{
-       int count = 0;
-
-       for (;;) {
-               static char line[1000];
-               unsigned char sha1[20];
-               char *refname;
-               int len;
-
-               len = packet_read_line(fd, line, sizeof(line));
-               if (!len)
-                       break;
-               if (line[len-1] == '\n')
-                       line[--len] = 0;
-               if (len < 42 || get_sha1_hex(line, sha1))
-                       die("git-fetch-pack: protocol error - expected ref descriptor, got '%s¤'", line);
-               refname = line+41;
-               if (nr_match && !path_match(refname, nr_match, match))
-                       continue;
-               count++;
-               memcpy(result, sha1, 20);
-       }
-       return count;
-}
-
 static int fetch_pack(int fd[2], int nr_match, char **match)
 {
-       unsigned char sha1[20], remote[20];
-       int heads, status;
+       struct ref *ref;
+       unsigned char sha1[20];
+       int status;
        pid_t pid;
 
-       heads = get_remote_heads(fd[0], nr_match, match, remote);
-       if (heads != 1) {
+       get_remote_heads(fd[0], &ref, nr_match, match);
+       if (!ref) {
                packet_flush(fd[1]);
-               die(heads ? "multiple remote heads" : "no matching remote head");
+               die("no matching remote head");
        }
-       if (find_common(fd, sha1, remote) < 0)
-               die("git-fetch-pack: no common commits");
+       if (find_common(fd, sha1, ref) < 0)
+               fprintf(stderr, "warning: no common commits\n");
        pid = fork();
        if (pid < 0)
                die("git-fetch-pack: unable to fork off git-unpack-objects");
        if (!pid) {
-               close(fd[1]);
                dup2(fd[0], 0);
                close(fd[0]);
-               execlp("git-unpack-objects", "git-unpack-objects", NULL);
+               close(fd[1]);
+               execlp("git-unpack-objects", "git-unpack-objects",
+                      quiet ? "-q" : NULL, NULL);
                die("git-unpack-objects exec failed");
        }
        close(fd[0]);
@@ -111,7 +109,11 @@ static int fetch_pack(int fd[2], int nr_match, char **match)
                int code = WEXITSTATUS(status);
                if (code)
                        die("git-unpack-objects died with error code %d", code);
-               puts(sha1_to_hex(remote));
+               while (ref) {
+                       printf("%s %s\n",
+                              sha1_to_hex(ref->old_sha1), ref->name);
+                       ref = ref->next;
+               }
                return 0;
        }
        if (WIFSIGNALED(status)) {
@@ -134,7 +136,18 @@ int main(int argc, char **argv)
                char *arg = argv[i];
 
                if (*arg == '-') {
-                       /* Arguments go here */
+                       if (!strncmp("--exec=", arg, 7)) {
+                               exec = arg + 7;
+                               continue;
+                       }
+                       if (!strcmp("-q", arg)) {
+                               quiet = 1;
+                               continue;
+                       }
+                       if (!strcmp("-v", arg)) {
+                               verbose = 1;
+                               continue;
+                       }
                        usage(fetch_pack_usage);
                }
                dest = arg;