diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 10:28:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 10:28:10 -0700 |
| commit | bac9c06ba093d9254cb2ab3eed074722a3e635a6 (patch) | |
| tree | a635335f31f8f0dfa7a679882cfab42429851a9b /builtin | |
| parent | 34df9fe36a3627e1c2a9ae244820fb61e3891b90 (diff) | |
| parent | c7730e6f5f5757ac278319f33b94c32458e21f12 (diff) | |
| download | git-bac9c06ba093d9254cb2ab3eed074722a3e635a6.tar.gz | |
Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4
* 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 eb38ab4e01..fe07bb7ba3 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; |