sequencer "edit" command always issues a warning
- From
Jeff King <peff@peff.net>
- Date
- Mar 16, 2017, 13:15 UTC
- Message-ID
- <20170316131534.4vpbub3vmde7maua@sigill.intra.peff.net>
I was rebasing with the new built-in sequencer code today, and I was surprised to see the use of warning() here:
$ git rebase -i
[set one commit to 'edit']
warning: stopped at 6ce6b914a... odb_pack_keep(): stop generating keepfile name
You can amend the commit now, with
[...more instructions...]It alarmed me for a minute until I realized that no, this is nothing to be alarmed about, but just git doing exactly what I told it to do.
The original just wrote:
Stopped at 6ce6b914a... odb_pack_keep(): stop generating keepfile name
It would be easy to switch back:
diff --git a/sequencer.c b/sequencer.c index 1f729b053..8183a83c1 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, and that would match most of the other messages that the command issues, which use a bare fprintf() and start with a capital letter. But I'm not sure if there was some reason to treat this one differently. -Peff