Merge branch 'th/diff-no-index-fixes'

diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index c57e8bd8c870175a1fce6cc75ceeb677a6895b46..b928beb8ed51c9af9aa4f640e80443a5e059d505 100644 (file)
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -14,22 +14,30 @@ static const char upload_archive_usage[] =
 static const char deadchild[] =
 "git upload-archive: archiver died with error";
 
-static const char lostchild[] =
-"git upload-archive: archiver process was lost";
-
 #define MAX_ARGS (64)
 
-static void prepare_argv(const char **sent_argv, const char **argv)
+int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
 {
+       const char *sent_argv[MAX_ARGS];
        const char *arg_cmd = "argument ";
        char *p, buf[4096];
        int sent_argc;
        int len;
 
+       if (argc != 2)
+               usage(upload_archive_usage);
+
+       if (strlen(argv[1]) + 1 > sizeof(buf))
+               die("insanely long repository name");
+
+       strcpy(buf, argv[1]); /* enter-repo smudges its argument */
+
+       if (!enter_repo(buf, 0))
+               die("'%s' does not appear to be a git repository", buf);
+
        /* put received options in sent_argv[] */
-       sent_argc = 2;
-       sent_argv[0] = "archive";
-       sent_argv[1] = "--remote-request";
+       sent_argc = 1;
+       sent_argv[0] = "git-upload-archive";
        for (p = buf;;) {
                /* This will die if not enough free space in buf */
                len = packet_read_line(0, p, (buf + sizeof buf) - p);
@@ -52,6 +60,9 @@ static void prepare_argv(const char **sent_argv, const char **argv)
                *p++ = 0;
        }
        sent_argv[sent_argc] = NULL;
+
+       /* parse all options sent by the client */
+       return write_archive(sent_argc, sent_argv, prefix, 0, NULL, 1);
 }
 
 __attribute__((format (printf, 1, 2)))
@@ -83,35 +94,33 @@ static ssize_t process_input(int child_fd, int band)
 
 int cmd_upload_archive(int argc, const char **argv, const char *prefix)
 {
-       const char *sent_argv[MAX_ARGS];
-       struct child_process cld = { sent_argv };
-       cld.out = cld.err = -1;
-       cld.git_cmd = 1;
-
-       if (argc != 2)
-               usage(upload_archive_usage);
-
-       if (!enter_repo(argv[1], 0))
-               die("'%s' does not appear to be a git repository", argv[1]);
-
-       prepare_argv(sent_argv, argv);
-       if (start_command(&cld)) {
+       struct child_process writer = { argv };
+
+       /*
+        * Set up sideband subprocess.
+        *
+        * We (parent) monitor and read from child, sending its fd#1 and fd#2
+        * multiplexed out to our fd#1.  If the child dies, we tell the other
+        * end over channel #3.
+        */
+       argv[0] = "upload-archive--writer";
+       writer.out = writer.err = -1;
+       writer.git_cmd = 1;
+       if (start_command(&writer)) {
                int err = errno;
-               packet_write(1, "NACK fork failed on the remote side\n");
+               packet_write(1, "NACK unable to spawn subprocess\n");
                die("upload-archive: %s", strerror(err));
        }
 
-       /* parent - read from child, multiplex and send out to fd#1 */
        packet_write(1, "ACK\n");
        packet_flush(1);
 
        while (1) {
                struct pollfd pfd[2];
-               int status;
 
-               pfd[0].fd = cld.out;
+               pfd[0].fd = writer.out;
                pfd[0].events = POLLIN;
-               pfd[1].fd = cld.err;
+               pfd[1].fd = writer.err;
                pfd[1].events = POLLIN;
                if (poll(pfd, 2, -1) < 0) {
                        if (errno != EINTR) {
@@ -130,9 +139,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
                        if (process_input(pfd[0].fd, 1))
                                continue;
 
-               if (waitpid(cld.pid, &status, 0) < 0)
-                       error_clnt("%s", lostchild);
-               else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
+               if (finish_command(&writer))
                        error_clnt("%s", deadchild);
                packet_flush(1);
                break;