diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-05 21:08:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-05 21:08:53 -0800 |
| commit | 76d44c8cfda9be1db78884580ab045c421b083fe (patch) | |
| tree | 9ac31805cf463c84b0bd097e5246a1711181323b /t | |
| parent | is_submodule_modified(): fix breakage with external GIT_INDEX_FILE (diff) | |
| parent | receive-pack: Send hook output over side band #2 (diff) | |
| download | tgif-76d44c8cfda9be1db78884580ab045c421b083fe.tar.xz | |
Merge branch 'sp/maint-push-sideband' into sp/push-sideband
* sp/maint-push-sideband:
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
Update git fsck --full short description to mention packs
Conflicts:
run-command.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5401-update-hooks.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh index 325714e529..0686390d2f 100755 --- a/t/t5401-update-hooks.sh +++ b/t/t5401-update-hooks.sh @@ -119,19 +119,19 @@ test_expect_success 'send-pack produced no output' ' ' cat <<EOF >expect -STDOUT pre-receive -STDERR pre-receive -STDOUT update refs/heads/master -STDERR update refs/heads/master -STDOUT update refs/heads/tofail -STDERR update refs/heads/tofail -STDOUT post-receive -STDERR post-receive -STDOUT post-update -STDERR post-update +remote: STDOUT pre-receive +remote: STDERR pre-receive +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: STDOUT post-receive +remote: STDERR post-receive +remote: STDOUT post-update +remote: STDERR post-update EOF test_expect_success 'send-pack stderr contains hook messages' ' - grep ^STD send.err >actual && + grep ^remote: send.err | sed "s/ *\$//" >actual && test_cmp - actual <expect ' |