Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4

[git.git] / builtin / send-pack.c

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index eb38ab4e01fac3b8ba2d564b31d17da21206f06b..fe07bb7ba3fa53bfa49684068781dd693b6ffe1b 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -344,6 +344,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;