diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-02-10 20:34:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-10 20:51:07 +0300 |
| commit | 466dbc42f58623d4341d6b1171b5cc13e2b700df (patch) | |
| tree | 57098271b25bcdc1f5be22774d21734905101b00 /t | |
| parent | 6b3fa7e7d13a3c8fddba43ad6e8acb314d1985ac (diff) | |
receive-pack: Send internal errors over side-band #2
If the client has requested side-band-64k capability, send any
of the internal error or warning messages in the muxed side-band
stream using the same band as our hook output, band #2. By putting
everything in one stream we ensure all messages are processed by
the side-band demuxer, avoiding interleaving between our own stderr
and the side-band demuxer's stderr buffers.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5401-update-hooks.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh index 7240fabfec..17bcb0b040 100755 --- a/t/t5401-update-hooks.sh +++ b/t/t5401-update-hooks.sh @@ -124,6 +124,7 @@ remote: STDOUT update refs/heads/master remote: STDERR update refs/heads/master remote: STDOUT update refs/heads/tofail remote: STDERR update refs/heads/tofail +remote: error: hook declined to update refs/heads/tofail remote: STDOUT post-receive remote: STDERR post-receive remote: STDOUT post-update @@ -131,7 +132,7 @@ remote: STDERR post-update EOF test_expect_success 'send-pack stderr contains hook messages' ' grep ^remote: send.err | sed "s/ *\$//" >actual && - test_cmp - actual <expect + test_cmp expect actual ' test_done |