Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-08-07 11:56:49 +0300
committerJunio C Hamano <gitster@pobox.com>2020-08-07 22:01:57 +0300
commit7c694024d4e119438a555469814e7d6ff0bac116 (patch)
tree2f7d77117fbd3332b1d431999b6e4214fafd1333 /sideband.c
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff)
sideband: mark "remote error:" prefix for translation
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>
Diffstat (limited to 'sideband.c')
-rw-r--r--sideband.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sideband.c b/sideband.c
index ef851113c4..0a60662fa6 100644
--- a/sideband.c
+++ b/sideband.c
@@ -147,7 +147,7 @@ int demultiplex_sideband(const char *me, char *buf, int len,
switch (band) {
case 3:
if (die_on_error)
- die("remote error: %s", buf + 1);
+ die(_("remote error: %s"), buf + 1);
strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "",
DISPLAY_PREFIX);
maybe_colorize_sideband(scratch, buf + 1, len);