Skip to content

Commit dcf2532

Browse files
committed
sequencer: avoid completely different messages for different actions
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent c27ae4f commit dcf2532

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

sequencer.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,8 @@ static int error_dirty_index(struct replay_opts *opts)
240240
if (read_cache_unmerged())
241241
return error_resolve_conflict(action_name(opts));
242242

243-
/* Different translation strings for cherry-pick and revert */
244-
if (opts->action == REPLAY_PICK)
245-
error(_("Your local changes would be overwritten by cherry-pick."));
246-
else
247-
error(_("Your local changes would be overwritten by revert."));
243+
error(_("Your local changes would be overwritten by %s."),
244+
action_name(opts));
248245

249246
if (advice_commit_before_merge)
250247
advise(_("Commit your changes or stash them to proceed."));

0 commit comments

Comments
 (0)