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

diff --git a/fetch-clone.c b/fetch-clone.c
index b62feac17d781f1223e6d01fa0b007afcccf909b..76b99afcdb8556fec284a621bbdc76223845877e 100644 (file)
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -115,12 +115,10 @@ static pid_t setup_sideband(int sideband, const char *me, int fd[2], int xd[2])
                die("%s: unable to fork off sideband demultiplexer", me);
        if (!side_pid) {
                /* subprocess */
-               char buf[DEFAULT_PACKET_MAX];
-
                close(fd[0]);
                if (xd[0] != xd[1])
                        close(xd[1]);
-               if (recv_sideband(me, xd[0], fd[1], 2, buf, sizeof(buf)))
+               if (recv_sideband(me, xd[0], fd[1], 2))
                        exit(1);
                exit(0);
        }