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>

diff --git a/sequencer.c b/sequencer.c
index 04fcfd893f6bcc5a0f54502c57f5fb61d17ea07e..120a8ee3512b23662e4b3ff9bfd200b7bfad23cb 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
        if (read_cache_unmerged())
                return error_resolve_conflict(action_name(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."));
 
        if (advice_commit_before_merge)
                advise(_("Commit your changes or stash them to proceed."));