Re: [PATCH 4/6] send-pack: improve unpack-status error messages
- Date: Tue, 07 Mar 2017 14:56:27 -0800
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: [PATCH 4/6] send-pack: improve unpack-status error messages
Jeff King <peff@xxxxxxxx> 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.
> Signed-off-by: Jeff King <peff@xxxxxxxx>
> 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;