Merge branch 'sp/maint-push-sideband' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 06:54:50 +0000 (22:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 06:54:50 +0000 (22:54 -0800)
commita886ba2801cbe0a4d6bbc34714cb09996dbcc127
tree54617f7bba6f1e1640145d10b6f662cc0111775c
parenta625740aae48c0f08916e564bc11f49542d4fb48
parent466dbc42f58623d4341d6b1171b5cc13e2b700df
Merge branch 'sp/maint-push-sideband' into maint

* 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

Conflicts:
builtin-receive-pack.c
run-command.c
t/t5401-update-hooks.sh
Documentation/technical/api-run-command.txt
builtin-receive-pack.c
builtin-send-pack.c
convert.c
remote-curl.c
run-command.c
run-command.h