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>
Jeff King committed
Mar 16, 2017 at 20:19 UTC
994292130121175dcb53f72541b7445e4b054d75
1 file changed
+2
-1
sequencer.c
+2
-1
@@ -1997,7 +1997,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
1997
if (item->command == TODO_EDIT) {
1998
struct commit *commit = item->commit;
1999
if (!res)
2000
- warning(_("stopped at %s... %.*s"),
2000
+ fprintf(stderr,
2001
+ _("Stopped at %s... %.*s"),
2002
short_commit_name(commit),
2003
item->arg_len, item->arg);
2004
return error_with_patch(commit,