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>
Johannes Schindelin committed
Oct 21, 2016 at 14:24 UTC
e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e
1 file changed
+2
-5
sequencer.c
+2
-5
@@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
229
if (read_cache_unmerged())
230
return error_resolve_conflict(action_name(opts));
231
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));
234
235
if (advice_commit_before_merge)
236
advise(_("Commit your changes or stash them to proceed."));