undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: avoid completely different messages for different actions

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2016-10-21 14:24:50 +02:00 committed by Junio C Hamano
parent 6307041dd2
commit e635d5ceb7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sequencer.c
View File

@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
if (read_cache_unmerged()) if (read_cache_unmerged())
return error_resolve_conflict(action_name(opts)); return error_resolve_conflict(action_name(opts));
/* Different translation strings for cherry-pick and revert */ error(_("Your local changes would be overwritten by %s."),
if (opts->action == REPLAY_PICK) action_name(opts));
error(_("Your local changes would be overwritten by cherry-pick."));
else
error(_("Your local changes would be overwritten by revert."));
if (advice_commit_before_merge) if (advice_commit_before_merge)
advise(_("Commit your changes or stash them to proceed.")); advise(_("Commit your changes or stash them to proceed."));