Skip to content

Commit e635d5c

Browse files
dschogitster
authored andcommitted
sequencer: avoid completely different messages for different actions
Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6307041 commit e635d5c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

sequencer.c

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

232-
/* Different translation strings for cherry-pick and revert */
233-
if (opts->action == REPLAY_PICK)
234-
error(_("Your local changes would be overwritten by cherry-pick."));
235-
else
236-
error(_("Your local changes would be overwritten by revert."));
232+
error(_("Your local changes would be overwritten by %s."),
233+
action_name(opts));
237234

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

0 commit comments

Comments
 (0)