summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:20 (GMT)
commita66fae3827d4bf39ddfdc19bbb818d67e2a3c20a (patch)
tree9466bc040243464bfc29c60b6f92ce4d33acd4c5 /builtin/send-pack.c
parent5c359a66586cfa802f9a4b205da9750582bdb9ec (diff)
parentc7730e6f5f5757ac278319f33b94c32458e21f12 (diff)
downloadgit-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.zip
git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.gz
git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.bz2
Merge branch 'jk/git-connection-deadlock-fix'
* 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/send-pack.c')
-rw-r--r--builtin/send-pack.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index e6a3495..c1f6ddd 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;