merge-recursive: adjust to loosened "working file clobbered" check

diff --git a/fetch-clone.c b/fetch-clone.c
index 873312df3d7ee28f847dfa5886a603981dcce8c2..76b99afcdb8556fec284a621bbdc76223845877e 100644 (file)
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -1,5 +1,7 @@
 #include "cache.h"
 #include "exec_cmd.h"
+#include "pkt-line.h"
+#include "sideband.h"
 #include <sys/wait.h>
 #include <sys/time.h>
 
@@ -23,7 +25,7 @@ static int finish_pack(const char *pack_tmp_name, const char *me)
 
        pid = fork();
        if (pid < 0)
-               die("git-clone-pack: unable to fork off git-index-pack");
+               die("%s: unable to fork off git-index-pack", me);
        if (!pid) {
                close(0);
                dup2(pipe_fd[1], 1);
@@ -43,9 +45,8 @@ static int finish_pack(const char *pack_tmp_name, const char *me)
 
        for (;;) {
                int status, code;
-               int retval = waitpid(pid, &status, 0);
 
-               if (retval < 0) {
+               if (waitpid(pid, &status, 0) < 0) {
                        if (errno == EINTR)
                                continue;
                        error("waitpid failed (%s)", strerror(errno));
@@ -94,11 +95,46 @@ static int finish_pack(const char *pack_tmp_name, const char *me)
        exit(1);
 }
 
-int receive_unpack_pack(int fd[2], const char *me, int quiet)
+static pid_t setup_sideband(int sideband, const char *me, int fd[2], int xd[2])
+{
+       pid_t side_pid;
+
+       if (!sideband) {
+               fd[0] = xd[0];
+               fd[1] = xd[1];
+               return 0;
+       }
+       /* xd[] is talking with upload-pack; subprocess reads from
+        * xd[0], spits out band#2 to stderr, and feeds us band#1
+        * through our fd[0].
+        */
+       if (pipe(fd) < 0)
+               die("%s: unable to set up pipe", me);
+       side_pid = fork();
+       if (side_pid < 0)
+               die("%s: unable to fork off sideband demultiplexer", me);
+       if (!side_pid) {
+               /* subprocess */
+               close(fd[0]);
+               if (xd[0] != xd[1])
+                       close(xd[1]);
+               if (recv_sideband(me, xd[0], fd[1], 2))
+                       exit(1);
+               exit(0);
+       }
+       close(xd[0]);
+       close(fd[1]);
+       fd[1] = xd[1];
+       return side_pid;
+}
+
+int receive_unpack_pack(int xd[2], const char *me, int quiet, int sideband)
 {
        int status;
-       pid_t pid;
+       pid_t pid, side_pid;
+       int fd[2];
 
+       side_pid = setup_sideband(sideband, me, fd, xd);
        pid = fork();
        if (pid < 0)
                die("%s: unable to fork off git-unpack-objects", me);
@@ -139,18 +175,18 @@ int receive_unpack_pack(int fd[2], const char *me, int quiet)
 
 /*
  * A "binary msec" is a power-of-two-msec, aka 1/1024th of a second.
- * Keeing the time in that format means that "bytes / msecs" means
- * is the same as kB/s (modulo rounding).
+ * Keeping the time in that format means that "bytes / msecs" means
+ * the same as kB/s (modulo rounding).
  *
  * 1000512 is a magic number (usecs in a second, rounded up by half
  * of 1024, to make "rounding" come out right ;)
  */
 #define usec_to_binarymsec(x) ((int)(x) / (1000512 >> 10))
 
-int receive_keep_pack(int fd[2], const char *me, int quiet)
+int receive_keep_pack(int xd[2], const char *me, int quiet, int sideband)
 {
        char tmpfile[PATH_MAX];
-       int ofd, ifd;
+       int ofd, ifd, fd[2];
        unsigned long total;
        static struct timeval prev_tv;
        struct average {
@@ -160,6 +196,8 @@ int receive_keep_pack(int fd[2], const char *me, int quiet)
        unsigned long avg_bytes, avg_time;
        int idx = 0;
 
+       setup_sideband(sideband, me, fd, xd);
+
        ifd = fd[0];
        snprintf(tmpfile, sizeof(tmpfile),
                 "%s/pack/tmp-XXXXXX", get_object_directory());
@@ -178,10 +216,13 @@ int receive_keep_pack(int fd[2], const char *me, int quiet)
                if (sz == 0)
                        break;
                if (sz < 0) {
-                       error("error reading pack (%s)", strerror(errno));
-                       close(ofd);
-                       unlink(tmpfile);
-                       return -1;
+                       if (errno != EINTR && errno != EAGAIN) {
+                               error("error reading pack (%s)", strerror(errno));
+                               close(ofd);
+                               unlink(tmpfile);
+                               return -1;
+                       }
+                       sz = 0;
                }
                pos = 0;
                while (pos < sz) {