sequencer: do not translate parameters to error_resolve_conflict()
`error_resolve_conflict()` checks the untranslated action_name parameter, so pass it as is. Suggested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Aug 18, 2022 at 15:13 UTC
1c8dfc3674fd9da7ded669b706b292ee2074db73
1 file changed
+2
-2
sequencer.c
+2
-2
@@ -537,7 +537,7 @@ static struct tree *empty_tree(struct repository *r)
537
static int error_dirty_index(struct repository *repo, struct replay_opts *opts)
538
{
539
if (repo_read_index_unmerged(repo))
540
- return error_resolve_conflict(_(action_name(opts)));
540
+ return error_resolve_conflict(action_name(opts));
541
542
error(_("your local changes would be overwritten by %s."),
543
_(action_name(opts)));
@@ -3753,7 +3753,7 @@ static int do_reset(struct repository *r,
3753
init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
3754
3755
if (repo_read_index_unmerged(r)) {
3756
- ret = error_resolve_conflict(_(action_name(opts)));
3756
+ ret = error_resolve_conflict(action_name(opts));
3757
goto cleanup;
3758
}
3759