mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sideband: mark "remote error:" prefix for translation

Browse Source 
A Git client may produce a "remote error:" message (along with whatever
error the other side sent us) in two places:

  - when we see an ERR packet

  - when we're using a sideband and see sideband 3

We can't reliably translate the message the other side sent us, but we
can do so for our own prefix. However, we translate only the ERR-packet
case but not the sideband-3 case. Let's make them consistent (by marking
both for translation).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2020-08-07 04:56:49 -04:00
committed by Junio C Hamano
parent 47ae905ffb
commit 7c694024d4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sideband.c
View File

@ -147,7 +147,7 @@ int demultiplex_sideband(const char *me, char *buf, int len,
switch (band) { switch (band) {
case 3: case 3:
if (die_on_error) if (die_on_error)
die("remote error: %s", buf + 1); die(_("remote error: %s"), buf + 1);
strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "", strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "",
DISPLAY_PREFIX); DISPLAY_PREFIX);
maybe_colorize_sideband(scratch, buf + 1, len); maybe_colorize_sideband(scratch, buf + 1, len);