From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Apr 2011 22:20:39 +0000 (-0700)
Subject: Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint... 
X-Git-Tag: v1.7.5.3~13^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73776dc1ebb61bc797e9f2fcfdfcd773511dfb8a;p=git.git

Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
  send-pack: avoid deadlock when pack-object dies early

Evil merge to adjust the way the use of pthreads in sideband-demultiplexor
was decided (earlier it was "if we are not on Windows", now it is "if we
are not using pthreads").
---

73776dc1ebb61bc797e9f2fcfdfcd773511dfb8a
diff --cc builtin-send-pack.c
index 6019eac91,651628871..f6e99f569
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@@ -226,6 -376,9 +227,9 @@@ static void print_helper_status(struct 
  static int sideband_demux(int in, int out, void *data)
  {
  	int *fd = data;
 -#ifndef WIN32
++#ifdef NO_PTHREADS
+ 	close(fd[1]);
+ #endif
  	int ret = recv_sideband("send-pack", fd[0], out);
  	close(out);
  	return ret;