From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Horst Schirmeier <horst@schirmeier.com>, git@vger.kernel.org
Subject: Re: [PATCH 4/6] send-pack: improve unpack-status error messages
Date: Tue, 07 Mar 2017 14:56:27 -0800 [thread overview]
Message-ID: <xmqq37eo66hw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170307133736.4lpn7mgme26dqs3m@sigill.intra.peff.net> (Jeff King's message of "Tue, 7 Mar 2017 08:37:36 -0500")
Jeff King <peff@peff.net> writes:
> When the remote tells us that the "unpack" step failed, we
> show an error message. However, unless you are familiar with
> the internals of send-pack and receive-pack, it was not
> clear that this represented an error on the remote side.
> Let's re-word to make that more obvious.
>
> Likewise, when we got an unexpected packet from the other
> end, we complained with a vague message but did not actually
> show the packet. Let's fix that.
Both make sense.
> And finally, neither message was marked for translation. The
> message from the remote probably won't be translated, but
> there's no reason we can't do better for the local half.
Hmm, OK.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> send-pack.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/send-pack.c b/send-pack.c
> index 243633da1..83c23aef6 100644
> --- a/send-pack.c
> +++ b/send-pack.c
> @@ -134,9 +134,9 @@ static int receive_unpack_status(int in)
> {
> const char *line = packet_read_line(in, NULL);
> if (!skip_prefix(line, "unpack ", &line))
> - return error("did not receive remote status");
> + return error(_("unable to parse remote unpack status: %s"), line);
> if (strcmp(line, "ok"))
> - return error("unpack failed: %s", line);
> + return error(_("remote unpack failed: %s"), line);
> return 0;
> }
next prev parent reply other threads:[~2017-03-07 23:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-07 11:03 regression: git push in non-shared repo stalls (v2.11.0+) Horst Schirmeier
2017-03-07 11:14 ` Horst Schirmeier
2017-03-07 13:34 ` [PATCH 0/6] deadlock regression in v2.11.0 with failed mkdtemp Jeff King
2017-03-07 13:35 ` [PATCH 1/6] receive-pack: fix deadlock when we cannot create tmpdir Jeff King
2017-03-07 13:35 ` [PATCH 2/6] send-pack: extract parsing of "unpack" response Jeff King
2017-03-07 13:36 ` [PATCH 3/6] send-pack: use skip_prefix for parsing unpack status Jeff King
2017-03-07 13:37 ` [PATCH 4/6] send-pack: improve unpack-status error messages Jeff King
2017-03-07 22:56 ` Junio C Hamano [this message]
2017-03-08 5:45 ` Jeff King
2017-03-08 17:19 ` Junio C Hamano
2017-03-07 13:38 ` [PATCH 5/6] send-pack: read "unpack" status even on pack-objects failure Jeff King
2017-03-07 13:39 ` [PATCH 6/6] send-pack: report signal death of pack-objects Jeff King
2017-03-07 13:50 ` [PATCH 0/6] deadlock regression in v2.11.0 with failed mkdtemp Jeff King
2017-03-08 17:58 ` Horst Schirmeier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq37eo66hw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=horst@schirmeier.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).