Code

Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:27:55 +0000 (10:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:27:55 +0000 (10:27 -0700)
commit34df9fe36a3627e1c2a9ae244820fb61e3891b90
treed33bcbf6d1cbc2512d1cbffa0a36bbfdf6bae991
parent420147290dc6f96d5007da7a089ab2ac9f1e99d4
parent1c1f046c43d3bb9ba2c094bbe2e87df833b71508
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4

* 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