зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
5670e0ec15
Коммит
1c8dfc3674
|
@ -537,7 +537,7 @@ static struct tree *empty_tree(struct repository *r)
|
|||
static int error_dirty_index(struct repository *repo, struct replay_opts *opts)
|
||||
{
|
||||
if (repo_read_index_unmerged(repo))
|
||||
return error_resolve_conflict(_(action_name(opts)));
|
||||
return error_resolve_conflict(action_name(opts));
|
||||
|
||||
error(_("your local changes would be overwritten by %s."),
|
||||
_(action_name(opts)));
|
||||
|
@ -3753,7 +3753,7 @@ static int do_reset(struct repository *r,
|
|||
init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
|
||||
|
||||
if (repo_read_index_unmerged(r)) {
|
||||
ret = error_resolve_conflict(_(action_name(opts)));
|
||||
ret = error_resolve_conflict(action_name(opts));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче