]> git.ipfire.org Git - thirdparty/git.git/commitdiff
sequencer: fix missing newline
authorBrandon Williams <bmwill@google.com>
Thu, 23 Mar 2017 17:02:33 +0000 (10:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Mar 2017 18:19:23 +0000 (11:19 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c

index 8183a83c1fa3f8d38054c163ecf65cb861a8b0d5..d76dc9cb2b07227d311e4a667aaa5f0d305da45d 100644 (file)
@@ -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,