From: Junio C Hamano <gitster@pobox•com>
To: Brandon Williams <bmwill@google•com>
Cc: git@vger•kernel.org, johannes.schindelin@gmx•de,
Jeff King <peff@peff•net>
Subject: Re: [PATCH] sequencer: fix missing newline
Date: Thu, 23 Mar 2017 11:19:50 -0700 [thread overview]
Message-ID: <xmqqzigbdfeh.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170323170233.50499-1-bmwill@google.com> (Brandon Williams's message of "Thu, 23 Mar 2017 10:02:33 -0700")
Brandon Williams <bmwill@google•com> writes:
> When using rebase --interactive where one of the lines is marked as
> 'edit' this is the resulting output:
>
> Stopped at ec3b9c4... stuffYou can amend the commit now, with
>
> git commit --amend
>
> Once you are satisfied with your changes, run
>
> git rebase --continue
>
> A newline character is missing at the end of the "Stopped at ..." line and
> before the "You can amend ..." line. This patch fixes the malformed output by
> adding the missing newline character to the end of the "Stopped at ..." line.
>
> Signed-off-by: Brandon Williams <bmwill@google•com>
> ---
> sequencer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Oops, obviously correct. Thanks.
> diff --git a/sequencer.c b/sequencer.c
> index 8183a83c1..d76dc9cb2 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1998,7 +1998,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
> struct commit *commit = item->commit;
> if (!res)
> fprintf(stderr,
> - _("Stopped at %s... %.*s"),
> + _("Stopped at %s... %.*s\n"),
> short_commit_name(commit),
> item->arg_len, item->arg);
> return error_with_patch(commit,
next prev parent reply other threads:[~2017-03-23 18:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 17:02 [PATCH] sequencer: fix missing newline Brandon Williams
2017-03-23 17:40 ` Johannes Schindelin
2017-03-23 17:47 ` Brandon Williams
2017-03-23 18:22 ` Jeff King
2017-03-23 18:24 ` Jeff King
2017-03-23 18:24 ` Brandon Williams
2017-03-23 18:19 ` Junio C Hamano [this message]
2017-03-23 22:12 ` Jonathan Nieder
2017-03-23 22:38 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzigbdfeh.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=bmwill@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox