Merge branch 'sp/maint-push-sideband' into maint-1.6.6
commit8499da04766e46f50872b615a9972da53209253a
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:54:01 +0000 (7 14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:54:01 +0000 (7 14:54 -0800)
tree4c10ac0bebff1d6d4c30a2889b166a15ab985953
parent47b333f7593d7b1883062d7e6ad4069f0ff19b23
parent466dbc42f58623d4341d6b1171b5cc13e2b700df
Merge branch 'sp/maint-push-sideband' into maint-1.6.6

* sp/maint-push-sideband:
  receive-pack: Send internal errors over side-band #2
  t5401: Use a bare repository for the remote peer
  receive-pack: Send hook output over side band #2
  receive-pack: Wrap status reports inside side-band-64k
  receive-pack: Refactor how capabilities are shown to the client
  send-pack: demultiplex a sideband stream with status data
  run-command: support custom fd-set in async
  run-command: Allow stderr to be a caller supplied pipe