diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:33:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:33:25 -0700 |
| commit | 5590fe762ff9d68f6968d80979e446576e61e2e1 (patch) | |
| tree | 0900e26fc5c06b94be0cab1aac91ccb3b89c7edd /builtin | |
| parent | f09937de964bb30e0614123daa9051afbffb4408 (diff) | |
| parent | c7730e6f5f5757ac278319f33b94c32458e21f12 (diff) | |
| download | git-5590fe762ff9d68f6968d80979e446576e61e2e1.tar.gz | |
Merge branch 'jk/git-connection-deadlock-fix' into maint
* jk/git-connection-deadlock-fix:
test core.gitproxy configuration
send-pack: avoid deadlock on git:// push with failed pack-objects
connect: let callers know if connection is a socket
connect: treat generic proxy processes like ssh processes
Conflicts:
connect.c
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/send-pack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index e6a3495e1c..c1f6ddd927 100644 --- 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; |