threads / patch / 45483

patchsequencer: fix missing newline

Subject: [PATCH] sequencer: fix missing newline

## tl;dr

9 messages between Mar 23, 2017 and Mar 23, 2017. Diffs are folded; open one to read it.

replies: 8people: 5as markdown or json

Brandon Williams· Mar 23, 2017, 17:02 UTC · lore

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(-)
Show changes to sequencer.c +1 −1
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,
-- 
2.12.1.500.gab5fba24ee-goog
Johannes Schindelin· Mar 23, 2017, 17:40 UTC · re: Brandon Williams · lore

Re: [PATCH] sequencer: fix missing newline

Hi Brandon,
On Thu, 23 Mar 2017, Brandon Williams wrote:
> 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

Ugh, I should have caught this. The warning() call implicitly adds a newline, the fprintf() doesn't.

Patch is obviously good.

Thanks, Dscho

Brandon Williams· Mar 23, 2017, 17:47 UTC · re: Johannes Schindelin · lore

Re: [PATCH] sequencer: fix missing newline

On 03/23, Johannes Schindelin wrote:
Show 13 quoted lines
> Hi Brandon,
> 
> On Thu, 23 Mar 2017, Brandon Williams wrote:
> 
> > 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
> 
> Ugh, I should have caught this. The warning() call implicitly adds a
> newline, the fprintf() doesn't.
> 
> Patch is obviously good.

All good. If we're keeping score for finding each others bugs, I still think you're winning :)

-- 
Brandon Williams
Jeff King· Mar 23, 2017, 18:22 UTC · re: Brandon Williams · lore

Re: [PATCH] sequencer: fix missing newline

On Thu, Mar 23, 2017 at 10:47:16AM -0700, Brandon Williams wrote:
Show 17 quoted lines
> On 03/23, Johannes Schindelin wrote:
> > Hi Brandon,
> > 
> > On Thu, 23 Mar 2017, Brandon Williams wrote:
> > 
> > > 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
> > 
> > Ugh, I should have caught this. The warning() call implicitly adds a
> > newline, the fprintf() doesn't.
> > 
> > Patch is obviously good.
> 
> All good.  If we're keeping score for finding each others bugs, I still
> think you're winning :)
It's my bug, actually. Brown paper bag, anyone?
-Peff
Jeff King· Mar 23, 2017, 18:24 UTC · re: Jeff King · lore

Re: [PATCH] sequencer: fix missing newline

On Thu, Mar 23, 2017 at 02:22:21PM -0400, Jeff King wrote:
Show 14 quoted lines
> > > > 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
> > > 
> > > Ugh, I should have caught this. The warning() call implicitly adds a
> > > newline, the fprintf() doesn't.
> > > 
> > > Patch is obviously good.
> > 
> > All good.  If we're keeping score for finding each others bugs, I still
> > think you're winning :)
> 
> It's my bug, actually. Brown paper bag, anyone?

The most embarrassing part is that I've been running with this for days and didn't notice. I guess I just gloss over the hint text.

-Peff
Brandon Williams· Mar 23, 2017, 18:24 UTC · re: Jeff King · lore

Re: [PATCH] sequencer: fix missing newline

On 03/23, Jeff King wrote:
Show 21 quoted lines
> On Thu, Mar 23, 2017 at 10:47:16AM -0700, Brandon Williams wrote:
> 
> > On 03/23, Johannes Schindelin wrote:
> > > Hi Brandon,
> > > 
> > > On Thu, 23 Mar 2017, Brandon Williams wrote:
> > > 
> > > > 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
> > > 
> > > Ugh, I should have caught this. The warning() call implicitly adds a
> > > newline, the fprintf() doesn't.
> > > 
> > > Patch is obviously good.
> > 
> > All good.  If we're keeping score for finding each others bugs, I still
> > think you're winning :)
> 
> It's my bug, actually. Brown paper bag, anyone?
TIL I should use 'blame' before actually blaming someone ;P
-- 
Brandon Williams
Junio C Hamano· Mar 23, 2017, 18:19 UTC · re: Brandon Williams · lore

Re: [PATCH] sequencer: fix missing newline

Brandon Williams <bmwill@google.com> writes:
Show 19 quoted lines
> 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.
Show 13 quoted lines
> 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,
Jonathan Nieder· Mar 23, 2017, 22:12 UTC · re: Brandon Williams · lore

Re: [PATCH] sequencer: fix missing newline

Brandon Williams wrote:
> 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
[...]
> Signed-off-by: Brandon Williams <bmwill@google.com>
> ---
>  sequencer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for fixing it. I don't see any other fprintf in the file with missing \r or \n at the end, so this fix looks complete.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Junio C Hamano· Mar 23, 2017, 22:38 UTC · re: Jonathan Nieder · lore

Re: [PATCH] sequencer: fix missing newline

Jonathan Nieder <jrnieder@gmail.com> writes:
Show 16 quoted lines
> Brandon Williams wrote:
>
>> 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
> [...]
>> Signed-off-by: Brandon Williams <bmwill@google.com>
>> ---
>>  sequencer.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Thanks for fixing it.  I don't see any other fprintf in the file with
> missing \r or \n at the end, so this fix looks complete.
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.

← back to recent threads