sequencer: avoid completely different messages for different actions
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6307041dd2
commit
e635d5ceb7
@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
|
||||
if (read_cache_unmerged())
|
||||
return error_resolve_conflict(action_name(opts));
|
||||
|
||||
/* Different translation strings for cherry-pick and revert */
|
||||
if (opts->action == REPLAY_PICK)
|
||||
error(_("Your local changes would be overwritten by cherry-pick."));
|
||||
else
|
||||
error(_("Your local changes would be overwritten by revert."));
|
||||
error(_("Your local changes would be overwritten by %s."),
|
||||
action_name(opts));
|
||||
|
||||
if (advice_commit_before_merge)
|
||||
advise(_("Commit your changes or stash them to proceed."));
|
||||
|
Loading…
Reference in New Issue
Block a user