{"thread":{"id":"45483","subject":"[PATCH] sequencer: fix missing newline","startedAt":"2017-03-23T17:02:50Z","lastAt":"2017-03-23T22:38:22Z","messageCount":9,"participants":["Brandon Williams","Johannes Schindelin","Junio C Hamano","Jeff King","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"315114","messageId":"20170323170233.50499-1-bmwill@google.com","threadId":"45483","inReplyTo":null,"subject":"[PATCH] sequencer: fix missing newline","fromName":"Brandon Williams","fromEmail":"bmwill@google.com","sentAt":"2017-03-23T17:02:33Z","receivedAt":"2017-03-23T17:02:50Z","isPatch":true,"sender":{"key":"bwilliams.eng@gmail.com","avatar":null},"body":"When using rebase --interactive where one of the lines is marked as\n'edit' this is the resulting output:\n\n Stopped at ec3b9c4... stuffYou can amend the commit now, with\n\n git commit --amend\n\n Once you are satisfied with your changes, run\n\n git rebase --continue\n\nA newline character is missing at the end of the \"Stopped at ...\" line and\nbefore the \"You can amend ...\" line. This patch fixes the malformed output by\nadding the missing newline character to the end of the \"Stopped at ...\" line.\n\nSigned-off-by: Brandon Williams \n---\n sequencer.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 8183a83c1..d76dc9cb2 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -1998,7 +1998,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)\n \t\t\t\tstruct commit *commit = item->commit;\n \t\t\t\tif (!res)\n \t\t\t\t\tfprintf(stderr,\n-\t\t\t\t\t\t_(\"Stopped at %s... %.*s\"),\n+\t\t\t\t\t\t_(\"Stopped at %s... %.*s\\n\"),\n \t\t\t\t\t\tshort_commit_name(commit),\n \t\t\t\t\t\titem->arg_len, item->arg);\n \t\t\t\treturn error_with_patch(commit,\n-- \n2.12.1.500.gab5fba24ee-goog\n\n"},{"id":"315125","messageId":"alpine.DEB.2.20.1703231839570.3767@virtualbox","threadId":"45483","inReplyTo":"20170323170233.50499-1-bmwill@google.com","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-03-23T17:40:33Z","receivedAt":"2017-03-23T17:40:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Brandon,\n\nOn Thu, 23 Mar 2017, Brandon Williams wrote:\n\n> When using rebase --interactive where one of the lines is marked as\n> 'edit' this is the resulting output:\n> \n> Stopped at ec3b9c4... stuffYou can amend the commit now, with\n\nUgh, I should have caught this. The warning() call implicitly adds a\nnewline, the fprintf() doesn't.\n\nPatch is obviously good.\n\nThanks,\nDscho\n"},{"id":"315128","messageId":"20170323174716.GA111250@google.com","threadId":"45483","inReplyTo":"alpine.DEB.2.20.1703231839570.3767@virtualbox","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Brandon Williams","fromEmail":"bmwill@google.com","sentAt":"2017-03-23T17:47:16Z","receivedAt":"2017-03-23T17:47:23Z","isPatch":true,"sender":{"key":"bwilliams.eng@gmail.com","avatar":null},"body":"On 03/23, Johannes Schindelin wrote:\n> Hi Brandon,\n> \n> On Thu, 23 Mar 2017, Brandon Williams wrote:\n> \n> > When using rebase --interactive where one of the lines is marked as\n> > 'edit' this is the resulting output:\n> > \n> > Stopped at ec3b9c4... stuffYou can amend the commit now, with\n> \n> Ugh, I should have caught this. The warning() call implicitly adds a\n> newline, the fprintf() doesn't.\n> \n> Patch is obviously good.\n\nAll good. If we're keeping score for finding each others bugs, I still\nthink you're winning :)\n\n-- \nBrandon Williams\n"},{"id":"315138","messageId":"xmqqzigbdfeh.fsf@gitster.mtv.corp.google.com","threadId":"45483","inReplyTo":"20170323170233.50499-1-bmwill@google.com","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-03-23T18:19:50Z","receivedAt":"2017-03-23T18:19:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brandon Williams writes:\n\n> When using rebase --interactive where one of the lines is marked as\n> 'edit' this is the resulting output:\n>\n> Stopped at ec3b9c4... stuffYou can amend the commit now, with\n>\n> git commit --amend\n>\n> Once you are satisfied with your changes, run\n>\n> git rebase --continue\n>\n> A newline character is missing at the end of the \"Stopped at ...\" line and\n> before the \"You can amend ...\" line. This patch fixes the malformed output by\n> adding the missing newline character to the end of the \"Stopped at ...\" line.\n>\n> Signed-off-by: Brandon Williams \n> ---\n> sequencer.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nOops, obviously correct. Thanks.\n\n> diff --git a/sequencer.c b/sequencer.c\n> index 8183a83c1..d76dc9cb2 100644\n> --- a/sequencer.c\n> +++ b/sequencer.c\n> @@ -1998,7 +1998,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)\n> \t\t\t\tstruct commit *commit = item->commit;\n> \t\t\t\tif (!res)\n> \t\t\t\t\tfprintf(stderr,\n> -\t\t\t\t\t\t_(\"Stopped at %s... %.*s\"),\n> +\t\t\t\t\t\t_(\"Stopped at %s... %.*s\\n\"),\n> \t\t\t\t\t\tshort_commit_name(commit),\n> \t\t\t\t\t\titem->arg_len, item->arg);\n> \t\t\t\treturn error_with_patch(commit,\n"},{"id":"315140","messageId":"20170323182221.i3noikxpmrn4ymi4@sigill.intra.peff.net","threadId":"45483","inReplyTo":"20170323174716.GA111250@google.com","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-03-23T18:22:21Z","receivedAt":"2017-03-23T18:22:34Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Mar 23, 2017 at 10:47:16AM -0700, Brandon Williams wrote:\n\n> On 03/23, Johannes Schindelin wrote:\n> > Hi Brandon,\n> > \n> > On Thu, 23 Mar 2017, Brandon Williams wrote:\n> > \n> > > When using rebase --interactive where one of the lines is marked as\n> > > 'edit' this is the resulting output:\n> > > \n> > > Stopped at ec3b9c4... stuffYou can amend the commit now, with\n> > \n> > Ugh, I should have caught this. The warning() call implicitly adds a\n> > newline, the fprintf() doesn't.\n> > \n> > Patch is obviously good.\n> \n> All good. If we're keeping score for finding each others bugs, I still\n> think you're winning :)\n\nIt's my bug, actually. Brown paper bag, anyone?\n\n-Peff\n"},{"id":"315142","messageId":"20170323182414.n7qgw7x4qibkg72z@sigill.intra.peff.net","threadId":"45483","inReplyTo":"20170323182221.i3noikxpmrn4ymi4@sigill.intra.peff.net","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-03-23T18:24:15Z","receivedAt":"2017-03-23T18:24:21Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Mar 23, 2017 at 02:22:21PM -0400, Jeff King wrote:\n\n> > > > When using rebase --interactive where one of the lines is marked as\n> > > > 'edit' this is the resulting output:\n> > > > \n> > > > Stopped at ec3b9c4... stuffYou can amend the commit now, with\n> > > \n> > > Ugh, I should have caught this. The warning() call implicitly adds a\n> > > newline, the fprintf() doesn't.\n> > > \n> > > Patch is obviously good.\n> > \n> > All good. If we're keeping score for finding each others bugs, I still\n> > think you're winning :)\n> \n> It's my bug, actually. Brown paper bag, anyone?\n\nThe most embarrassing part is that I've been running with this for days\nand didn't notice. I guess I just gloss over the hint text.\n\n-Peff\n"},{"id":"315143","messageId":"20170323182424.GB111250@google.com","threadId":"45483","inReplyTo":"20170323182221.i3noikxpmrn4ymi4@sigill.intra.peff.net","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Brandon Williams","fromEmail":"bmwill@google.com","sentAt":"2017-03-23T18:24:24Z","receivedAt":"2017-03-23T18:24:41Z","isPatch":true,"sender":{"key":"bwilliams.eng@gmail.com","avatar":null},"body":"On 03/23, Jeff King wrote:\n> On Thu, Mar 23, 2017 at 10:47:16AM -0700, Brandon Williams wrote:\n> \n> > On 03/23, Johannes Schindelin wrote:\n> > > Hi Brandon,\n> > > \n> > > On Thu, 23 Mar 2017, Brandon Williams wrote:\n> > > \n> > > > When using rebase --interactive where one of the lines is marked as\n> > > > 'edit' this is the resulting output:\n> > > > \n> > > > Stopped at ec3b9c4... stuffYou can amend the commit now, with\n> > > \n> > > Ugh, I should have caught this. The warning() call implicitly adds a\n> > > newline, the fprintf() doesn't.\n> > > \n> > > Patch is obviously good.\n> > \n> > All good. If we're keeping score for finding each others bugs, I still\n> > think you're winning :)\n> \n> It's my bug, actually. Brown paper bag, anyone?\n\nTIL I should use 'blame' before actually blaming someone ;P\n\n-- \nBrandon Williams\n"},{"id":"315195","messageId":"20170323221217.GA20794@aiede.mtv.corp.google.com","threadId":"45483","inReplyTo":"20170323170233.50499-1-bmwill@google.com","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2017-03-23T22:12:17Z","receivedAt":"2017-03-23T22:13:03Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Brandon Williams wrote:\n\n> When using rebase --interactive where one of the lines is marked as\n> 'edit' this is the resulting output:\n>\n> Stopped at ec3b9c4... stuffYou can amend the commit now, with\n[...]\n> Signed-off-by: Brandon Williams \n> ---\n> sequencer.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nThanks for fixing it. I don't see any other fprintf in the file with\nmissing \\r or \\n at the end, so this fix looks complete.\n\nReviewed-by: Jonathan Nieder \n"},{"id":"315208","messageId":"xmqqbmsraaax.fsf@gitster.mtv.corp.google.com","threadId":"45483","inReplyTo":"20170323221217.GA20794@aiede.mtv.corp.google.com","subject":"Re: [PATCH] sequencer: fix missing newline","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-03-23T22:38:14Z","receivedAt":"2017-03-23T22:38:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Brandon Williams wrote:\n>\n>> When using rebase --interactive where one of the lines is marked as\n>> 'edit' this is the resulting output:\n>>\n>> Stopped at ec3b9c4... stuffYou can amend the commit now, with\n> [...]\n>> Signed-off-by: Brandon Williams \n>> ---\n>> sequencer.c | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> Thanks for fixing it. I don't see any other fprintf in the file with\n> missing \\r or \\n at the end, so this fix looks complete.\n>\n> Reviewed-by: Jonathan Nieder \n\nThanks.\n"}]}