aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-01 12:58:34 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-01 12:58:34 -0700
commit03b98d2e78debf163d0dccc98a213dcd4608d7d8 (patch)
tree2ca07f03a4489b25fea0ec1f2dd39177b7187d20 /t
parent92f6e98c69670689c868452a91d9ed1c2c39eac2 (diff)
parent74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a (diff)
downloadgit-03b98d2e78debf163d0dccc98a213dcd4608d7d8.tar.gz
git-03b98d2e78debf163d0dccc98a213dcd4608d7d8.tar.xz
Merge branch 'jk/receive-pack-unpack-error-to-pusher'
Send errors from "unpack-objects" and "index-pack" back to the "git push" over the git and smart-http protocols, just like it is done for a push over the ssh 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-xt/t5504-fetch-receive-strict.sh2
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' '