From: Michael J Gruber Date: Thu, 18 Aug 2022 13:13:26 +0000 (+0200) Subject: sequencer: do not translate reflog messages X-Git-Tag: v2.38.0-rc0~53^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5670e0ec1576fd0cd68f7cb610c878c645786972;p=thirdparty%2Fgit.git sequencer: do not translate reflog messages Traditionally, reflog messages were never translated, in particular not on storage. Due to the switch of more parts of git to the sequencer, old changes in the sequencer code may lead to recent changes in git's behaviour. E.g.: c28cbc5ea6 ("sequencer: mark action_name() for translation", 2016-10-21) marked several uses of `action_name()` for translation. Recently, this lead to a partially translated reflog: `rebase: fast-forward` is translated (e.g. in de to `Rebase: Vorspulen`) whereas other reflog entries such as `rebase (pick):` remain untranslated as they should be. Change the relevant line in the sequencer so that this reflog entry remains untranslated, as well. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- diff --git a/sequencer.c b/sequencer.c index 5f22b7cd37..51d75dfbe1 100644 --- a/sequencer.c +++ b/sequencer.c @@ -575,7 +575,7 @@ static int fast_forward_to(struct repository *r, if (checkout_fast_forward(r, from, to, 1)) return -1; /* the callee should have complained already */ - strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts))); + strbuf_addf(&sb, "%s: fast-forward", action_name(opts)); transaction = ref_transaction_begin(&err); if (!transaction ||