Skip to content

Commit 9942921

Browse files
peffgitster
authored andcommitted
sequencer: drop "warning:" when stopping for edit
Since the conversion from shell to C in 56dc3ab (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 18633e1 commit 9942921

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

sequencer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
19971997
if (item->command == TODO_EDIT) {
19981998
struct commit *commit = item->commit;
19991999
if (!res)
2000-
warning(_("stopped at %s... %.*s"),
2000+
fprintf(stderr,
2001+
_("Stopped at %s... %.*s"),
20012002
short_commit_name(commit),
20022003
item->arg_len, item->arg);
20032004
return error_with_patch(commit,

0 commit comments

Comments
 (0)