b4 and git am -s errors (was Re: [PATCH 1/2] ext4: docs: switch away from list-table)

b4 and git am -s errors (was Re: [PATCH 1/2] ext4: docs: switch away from list-table)

[Konstantin Ryabitsev]

On Thu, Oct 07, 2021 at 08:48:41AM -0600, Jonathan Corbet wrote:
> Ah...I learned something today.  If you try to apply your own patches
> with "git am -s" (via b4 to lazily grab Jan's Reviewed-by tags), it
> fails, complaining about duplicate signoff lines.  I'd failed to notice
> that before.  I've *really* applied them this time (and tweaked my
> scripts :).

Butting myself into the conversation in a totally non-creepy all-seeing way.

Was that when using "git am" directly, or via "b4 shazam"?

-K

Re: b4 and git am -s errors (was Re: [PATCH 1/2] ext4: docs: switch away from list-table)

[Jonathan Corbet]

Konstantin Ryabitsev <konstantin@linuxfoundation.org> writes:

> On Thu, Oct 07, 2021 at 08:48:41AM -0600, Jonathan Corbet wrote:
>> Ah...I learned something today.  If you try to apply your own patches
>> with "git am -s" (via b4 to lazily grab Jan's Reviewed-by tags), it
>> fails, complaining about duplicate signoff lines.  I'd failed to notice
>> that before.  I've *really* applied them this time (and tweaked my
>> scripts :).
>
> Butting myself into the conversation in a totally non-creepy all-seeing way.

You can run but you can't hide :)

> Was that when using "git am" directly, or via "b4 shazam"?

My script is still "b4 am | git am", haven't tried shazam yet - it's
definitely on the radar, though.

Thanks,

jon

Re: b4 and git am -s errors (was Re: [PATCH 1/2] ext4: docs: switch away from list-table)

[Konstantin Ryabitsev]

On Thu, Oct 07, 2021 at 12:06:00PM -0600, Jonathan Corbet wrote:
> My script is still "b4 am | git am", haven't tried shazam yet - it's
> definitely on the radar, though.

Okay, now I'm curious which version of git this is, since I can't seem to
replicate this problem -- I just get:

- multiple identical Signed-off-by lines if my S-o-b is not the last
- nothing added to trailers if my S-o-b is already the last trailer

-K

Re: b4 and git am -s errors (was Re: [PATCH 1/2] ext4: docs: switch away from list-table)

[Jonathan Corbet]

Konstantin Ryabitsev <konstantin@linuxfoundation.org> writes:

> On Thu, Oct 07, 2021 at 12:06:00PM -0600, Jonathan Corbet wrote:
>> My script is still "b4 am | git am", haven't tried shazam yet - it's
>> definitely on the radar, though.
>
> Okay, now I'm curious which version of git this is, since I can't seem to
> replicate this problem -- I just get:
>
> - multiple identical Signed-off-by lines if my S-o-b is not the last
> - nothing added to trailers if my S-o-b is already the last trailer

2.31.1, as packaged by Fedora.  b4 0.8.0 from PyPI, for what that's worth.

Specifically, I do:

  b4 am -o ~/tmp -n am -c -t 20210902220854.198850-1-corbet@lwn.net
  git am -a ~/tmp/am.mbx

...and that prints "Duplicate Signed-off-by lines." and leaves the repo
in the "in the middle of an am session" state.

jon

Re: b4 and git am -s errors (was Re: [PATCH 1/2] ext4: docs: switch away from list-table)

[Konstantin Ryabitsev]

On Thu, Oct 07, 2021 at 01:11:11PM -0600, Jonathan Corbet wrote:
>   b4 am -o ~/tmp -n am -c -t 20210902220854.198850-1-corbet@lwn.net
>   git am -a ~/tmp/am.mbx
> 
> ...and that prints "Duplicate Signed-off-by lines." and leaves the repo
> in the "in the middle of an am session" state.

Ah, looks like you have .git/hooks/commit-msg -- the default one will check
for duplicate S-o-b lines.

Not much I can do here, I'm afraid, but thanks for helping me trace what's
going on.

-K