diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:34:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:34:19 -0700 |
| commit | 25c08907a0a178d352b318f8d1de15d2680394ff (patch) | |
| tree | 92573d3b0059d3608f8d5403b36617c5c1a1a49c /t | |
| parent | 9b4030cd98c7fa564905979d075aaf1312de8567 (diff) | |
| parent | 74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a (diff) | |
| download | git-25c08907a0a178d352b318f8d1de15d2680394ff.tar.gz git-25c08907a0a178d352b318f8d1de15d2680394ff.tar.xz | |
Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maint
"git receive-pack" (the counterpart to "git push") did not give
progress output while processing objects it received to the puser
when run over the smart-http protocol.
* jk/receive-pack-unpack-error-to-pusher:
receive-pack: drop "n/a" on unpacker errors
receive-pack: send pack-processing stderr over sideband
receive-pack: redirect unpack-objects stdout to /dev/null
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5504-fetch-receive-strict.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index 35ec294d9..69ee13c8b 100755 --- a/t/t5504-fetch-receive-strict.sh +++ b/t/t5504-fetch-receive-strict.sh @@ -89,7 +89,7 @@ test_expect_success 'push with !receive.fsckobjects' ' cat >exp <<EOF To dst -! refs/heads/master:refs/heads/test [remote rejected] (n/a (unpacker error)) +! refs/heads/master:refs/heads/test [remote rejected] (unpacker error) EOF test_expect_success 'push with receive.fsckobjects' ' |