Skip to content

Commit 5670e0e

Browse files
mjggitster
authored andcommitted
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.: c28cbc5 ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 795ea87 commit 5670e0e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sequencer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ static int fast_forward_to(struct repository *r,
575575
if (checkout_fast_forward(r, from, to, 1))
576576
return -1; /* the callee should have complained already */
577577

578-
strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));
578+
strbuf_addf(&sb, "%s: fast-forward", action_name(opts));
579579

580580
transaction = ref_transaction_begin(&err);
581581
if (!transaction ||

0 commit comments

Comments
 (0)