From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2010 18:00:49 +0000 (-0800)
Subject: Merge branch 'sp/maint-push-sideband' into sp/push-sideband
X-Git-Tag: v1.7.1-rc0~140^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc8eb6407e88a46da6d41e18cffed3878f2c53cf?hp=cc8eb6407e88a46da6d41e18cffed3878f2c53cf

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
---