From a1a3fd1f40a67165b849a2a1210ff3a7a2cbcdd6 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 16 May 2011 02:52:57 -0400 Subject: [PATCH] send-pack: avoid deadlock on git:// push with failed pack-objects Commit 09c9957c fixes a deadlock in which pack-objects fails, the remote end is still waiting for pack data, and we are still waiting for the remote end to say something (see that commit for a much more in-depth explanation). We solved the problem there by making sure the output pipe is closed on error; thus the remote sees EOF, and proceeds to complain and close its end of the connection. However, in the special case of push over git://, we don't have a pipe, but rather a full-duplex socket, with another dup()-ed descriptor in place of the second half of the pipe. In this case, closing the second descriptor signals nothing to the remote end, and we still deadlock. This patch calls shutdown() explicitly to signal EOF to the other side. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin-send-pack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin-send-pack.c b/builtin-send-pack.c index dfd3d1105d..eef19cb60a 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -520,6 +520,8 @@ int send_pack(struct send_pack_args *args, ref->status = REF_STATUS_NONE; if (args->stateless_rpc) close(out); + if (git_connection_is_socket(conn)) + shutdown(fd[0], SHUT_WR); if (use_sideband) finish_async(&demux); return -1; -- 2.11.4.GIT