[PATCH] remote-curl: Fix push status report when all branches fail
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Jan 19, 2012, 22:24 UTC
- Message-ID
- <1327011899-18883-1-git-send-email-spearce@spearce.org>
From: "Shawn O. Pearce" <spearce@spearce.org>
The protocol between transport-helper.c and remote-curl requires remote-curl to always print a blank line after the push command has run. If the blank line is ommitted, transport-helper kills its container process (the git push the user started) with exit(128) and no message indicating a problem, assuming the helper already printed reasonable error text to the console.
However if the remote rejects all branches with "ng" commands in the report-status reply, send-pack terminates with non-zero status, and in turn remote-curl exited with non-zero status before outputting the blank line after the helper status printed by send-pack. No error messages reach the user.
This caused users to see the following from git push over HTTP when the remote side's update hook rejected the branch:
$ git push http://... master Counting objects: 4, done. Delta compression using up to 6 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 301 bytes, done. Total 3 (delta 0), reused 0 (delta 0) $
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 <spearce@spearce.org> --- remote-curl.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c index 48c20b8..d6054e2 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -805,7 +805,7 @@ static int push(int nr_spec, char **specs) static void parse_push(struct strbuf *buf) { char **specs = NULL; - int alloc_spec = 0, nr_spec = 0, i; + int alloc_spec = 0, nr_spec = 0, i, ret; do { if (!prefixcmp(buf->buf, "push ")) { @@ -822,12 +822,11 @@ static void parse_push(struct strbuf *buf) break; } while (1); - if (push(nr_spec, specs)) + ret = push(nr_spec, specs); + xwrite(1, "\n", 1); + if (ret) exit(128); /* error already reported */ - printf("\n"); - fflush(stdout); - free_specs: for (i = 0; i < nr_spec; i++) free(specs[i]);
-- 1.7.8.4.dirty