Skip to content

Commit 434a776

Browse files
committed
Merge branch 'js/rebase-helper'
Recent update to "rebase -i" started showing a message that is not a warning with "warning:" prefix by mistake. This has been fixed. * js/rebase-helper: sequencer: drop "warning:" when stopping for edit
2 parents 4b7989b + 9942921 commit 434a776

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

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)