On Thu, Mar 16, 2017 at 11:59:35PM +0100, Johannes Schindelin wrote:
> I do not recall why I chose warning(); probably just an oversight on my
> part. Your patch looks good.
Thanks. Here it is with a commit message.
I agree with Junio that if we had "info()" it would perhaps be the right
thing to use. We can go down that road later if we choose to.
-- >8 --
Subject: [PATCH] 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 <p...@peff.net>
---
sequencer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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,
--
2.12.0.623.g86ec6c963
