diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-13 11:02:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 11:02:29 -0700 |
| commit | e9c1a3a426a4e93f093c79b31ec0b46064b6fb6e (patch) | |
| tree | 160e2cbf79652729ca62a0c3133c8082994b5822 | |
| parent | Merge branch 'jh/dirstat-lines' (diff) | |
| parent | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... (diff) | |
| download | tgif-e9c1a3a426a4e93f093c79b31ec0b46064b6fb6e.tar.xz | |
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
* js/maint-send-pack-stateless-rpc-deadlock-fix:
send-pack: unbreak push over stateless rpc
send-pack: avoid deadlock when pack-object dies early
| -rw-r--r-- | builtin/send-pack.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 8b0911c0d2..4ac2ca984f 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -229,6 +229,9 @@ static void print_helper_status(struct ref *ref) static int sideband_demux(int in, int out, void *data) { int *fd = data; +#ifdef NO_PTHREADS + close(fd[1]); +#endif int ret = recv_sideband("send-pack", fd[0], out); close(out); return ret; @@ -339,6 +342,8 @@ int send_pack(struct send_pack_args *args, if (pack_objects(out, remote_refs, extra_have, args) < 0) { for (ref = remote_refs; ref; ref = ref->next) ref->status = REF_STATUS_NONE; + if (args->stateless_rpc) + close(out); if (use_sideband) finish_async(&demux); return -1; |