diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:18 -0700 |
| commit | 434a7764bab3b93eb2e1777ca86550e59f3e9300 (patch) | |
| tree | 754d568009e4922aa89acba08a51798654404968 | |
| parent | 4b7989b10321e5558fc00c93408c6631f9fc604d (diff) | |
| parent | 994292130121175dcb53f72541b7445e4b054d75 (diff) | |
| download | git-434a7764bab3b93eb2e1777ca86550e59f3e9300.tar.gz | |
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
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 1f729b053b..8183a83c1f 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, |