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

* 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").

diff --cc builtin-send-pack.c
index 6019eac9182e22f2d485acdb83be209dbc49968a,651628871176e5d7569659aafc5b5d262c3f1987..f6e99f5690a1a01209f6bf7b9f9f39bcb1572333
--- 1/builtin-send-pack.c
--- 2/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;