From: Junio C Hamano Date: Fri, 20 Jan 2012 18:18:03 GMT Subject: Re: [PATCH] remote-curl: Fix push status report when all branches fail Message-ID: <7vfwfafdb8.fsf@alter.siamese.dyndns.org> In-Reply-To: <1327079011-24788-1-git-send-email-spearce@spearce.org> "Shawn O. Pearce" writes: > Always print a blank line after the send-pack process terminates, > ensuring the helper status report (if it was output) will be > correctly parsed by the calling transport-helper.c. This ensures > the helper doesn't abort before the status report can be shown to > the user. > > Signed-off-by: Shawn O. Pearce > --- Thanks; let's do the following on top of this patch, so that: - We won't miss a "git push" that errorneously succeeds; and - We won't be affected by any future change in the sideband #2 demultiplexor of the amount of "padding". t/t5541-http-push.sh | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git b/t/t5541-http-push.sh a/t/t5541-http-push.sh index d3e340e..b8f4c2a 100755 --- b/t/t5541-http-push.sh +++ a/t/t5541-http-push.sh @@ -101,8 +101,8 @@ exit 1 EOF chmod a+x "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update" -printf 'remote: error: hook declined to update refs/heads/dev2 \n' >exp -cat >>exp <exp < dev2 (hook declined) error: failed to push some refs to 'http://127.0.0.1:5541/smart/test_repo.git' @@ -115,8 +115,9 @@ test_expect_success 'rejected update prints status' ' git add path4 && test_tick && git commit -m dev2 && - git push origin dev2 2>act - test_cmp exp act + test_must_fail git push origin dev2 2>act && + sed -e "/^remote: /s/ *$//" cmp && + test_cmp exp cmp ' rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"