send-pack: improve unpack-status error messages
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. 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@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 7, 2017 at 08:37 UTC
40d05d04dd338f80b5392e8dea3a5c854798351e
1 file changed
+2
-2
send-pack.c
+2
-2
@@ -134,9 +134,9 @@ static int receive_unpack_status(int in)
134
{
135
const char *line = packet_read_line(in, NULL);
136
if (!skip_prefix(line, "unpack ", &line))
137
- return error("did not receive remote status");
137
+ return error(_("unable to parse remote unpack status: %s"), line);
138
if (strcmp(line, "ok"))
139
- return error("unpack failed: %s", line);
139
+ return error(_("remote unpack failed: %s"), line);
140
return 0;
141
}
142