diff options
| author | Jeff King <peff@peff.net> | 2017-03-17 03:19:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 20:31:48 +0300 |
| commit | 994292130121175dcb53f72541b7445e4b054d75 (patch) | |
| tree | 90459e6ab2e776777fb7147d0cf0e627e3f08dd8 /sequencer.c | |
| parent | 18633e1a22a68bbe8e6311a1039d13ebbf6fd041 (diff) | |
sequencer: drop "warning:" when stopping for edit
Since the conversion from shell to C in 56dc3ab04 (sequencer
(rebase -i): implement the 'edit' command, 2017-01-02),
stopping at an "edit" instruction went from:
$ git rebase -i
Stopped at 6ce6b914a... odb_pack_keep(): stop generating keepfile name
You can amend the commit now, with
[...more instructions...]
to:
$ git rebase -i
warning: stopped at 6ce6b914a... odb_pack_keep(): stop generating keepfile name
You can amend the commit now, with
[...more instructions...]
The "warning" implies that it's something unexpected, but
it's not. Let's switch back to the original message.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 1f729b053b..8183a83c1f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1997,7 +1997,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts) if (item->command == TODO_EDIT) { struct commit *commit = item->commit; if (!res) - warning(_("stopped at %s... %.*s"), + fprintf(stderr, + _("Stopped at %s... %.*s"), short_commit_name(commit), item->arg_len, item->arg); return error_with_patch(commit, |