Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint
commitf09937de964bb30e0614123daa9051afbffb4408
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:32:14 +0000 (26 09:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:32:14 +0000 (26 09:32 -0700)
tree6f12938a83b7226204a9903cedef1b963ab6d323
parent46bf76ac317031818ca7ff8d44d35ff79dae61d2
parent1c1f046c43d3bb9ba2c094bbe2e87df833b71508
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint

* js/maint-send-pack-stateless-rpc-deadlock-fix:
  sideband_demux(): fix decl-after-stmt
  send-pack: unbreak push over stateless rpc
  send-pack: avoid deadlock when pack-object dies early
builtin/send-pack.c