projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4201472 1c1f046)
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)
* 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

1  2 
builtin/send-pack.c patch | diff1 | diff2 | blob | history

diff --cc builtin/send-pack.c
Simple merge
Git—the stupid content tracker