Brandon Williams <bmw...@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 <bmw...@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,

Reply via email to