Merge branch 'nh/http'

diff --git a/upload-pack.c b/upload-pack.c
index 1834b6ba8c52ea9d8e166d9bc14a4156c289ba20..47560c9527b9c17db34f10e78d7c1f0d99b746e1 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -4,6 +4,7 @@
 #include "tag.h"
 #include "object.h"
 #include "commit.h"
+#include "exec_cmd.h"
 
 static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
 
@@ -13,6 +14,7 @@ static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=n
 #define MAX_HAS 256
 #define MAX_NEEDS 256
 static int nr_has = 0, nr_needs = 0, multi_ack = 0, nr_our_refs = 0;
+static int use_thin_pack = 0;
 static unsigned char has_sha1[MAX_HAS][20];
 static unsigned char needs_sha1[MAX_NEEDS][20];
 static unsigned int timeout = 0;
@@ -44,24 +46,26 @@ static void create_pack_file(void)
        if (!pid) {
                int i;
                int args;
-               char **argv;
+               const char **argv;
                char *buf;
                char **p;
 
-               if (create_full_pack)
+               if (create_full_pack) {
                        args = 10;
+                       use_thin_pack = 0; /* no point doing it */
+               }
                else
                        args = nr_has + nr_needs + 5;
-               argv = xmalloc(args * sizeof(char *));
+               p = xmalloc(args * sizeof(char *));
+               argv = (const char **) p;
                buf = xmalloc(args * 45);
-               p = argv;
 
                dup2(fd[1], 1);
                close(0);
                close(fd[0]);
                close(fd[1]);
-               *p++ = "git-rev-list";
-               *p++ = "--objects";
+               *p++ = "rev-list";
+               *p++ = use_thin_pack ? "--objects-edge" : "--objects";
                if (create_full_pack || MAX_NEEDS <= nr_needs)
                        *p++ = "--all";
                else {
@@ -79,13 +83,13 @@ static void create_pack_file(void)
                                buf += 41;
                        }
                *p++ = NULL;
-               execvp("git-rev-list", argv);
+               execv_git_cmd(argv);
                die("git-upload-pack: unable to exec git-rev-list");
        }
        dup2(fd[0], 0);
        close(fd[0]);
        close(fd[1]);
-       execlp("git-pack-objects", "git-pack-objects", "--stdout", NULL);
+       execl_git_cmd("pack-objects", "--stdout", NULL);
        die("git-upload-pack: unable to exec git-pack-objects");
 }
 
@@ -191,6 +195,8 @@ static int receive_needs(void)
                            "expected to get sha, not '%s'", line);
                if (strstr(line+45, "multi_ack"))
                        multi_ack = 1;
+               if (strstr(line+45, "thin-pack"))
+                       use_thin_pack = 1;
 
                /* We have sent all our refs already, and the other end
                 * should have chosen out of them; otherwise they are
@@ -212,9 +218,12 @@ static int receive_needs(void)
 
 static int send_ref(const char *refname, const unsigned char *sha1)
 {
-       static char *capabilities = "multi_ack";
+       static char *capabilities = "multi_ack thin-pack";
        struct object *o = parse_object(sha1);
 
+       if (!o)
+               die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
+
        if (capabilities)
                packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
                        0, capabilities);