[PATCH v4 10/25] sequencer: avoid completely different messages for different actions
From: Johannes Schindelin <hidden>
Date: 2016-10-14 13:21:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Johannes Schindelin <redacted> --- sequencer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index eac531b..9bca056 100644
--- 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)); - /* 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."));
--
2.10.1.513.g00ef6dd