Merge branch 'sp/maint-push-sideband' into sp/push-sideband
commitcc8eb6407e88a46da6d41e18cffed3878f2c53cf
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 18:00:49 +0000 (10 10:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 18:00:49 +0000 (10 10:00 -0800)
tree1f9d03f794d8d695c27ce60327c63b016e33fb71
parent76d44c8cfda9be1db78884580ab045c421b083fe
parent466dbc42f58623d4341d6b1171b5cc13e2b700df
Merge branch 'sp/maint-push-sideband' into sp/push-sideband

* sp/maint-push-sideband:
  receive-pack: Send internal errors over side-band #2
  t5401: Use a bare repository for the remote peer

Conflicts:
builtin-receive-pack.c
t/t5401-update-hooks.sh
builtin-receive-pack.c