`b4` drops added trailers with peculiar patch

`b4` drops added trailers with peculiar patch

[Miguel Ojeda]

Hi Konstantin,

I just noticed that trying to use `shazam` on:

  https://lore.kernel.org/rust-for-linux/20251201165601.31484-1-atharvd440@gmail.com/

would not add the trailers, including Link, SoB, etc.

Poking around inside `b4`, I noticed that the patch has an space in
the `---` line.

The message is probably considered broken, but it means that
`get_body_parts()` will split unexpectedly and then the trailers will
be added after the `---` line.

So, later, when `b4` uses `git am` to apply, they get discarded
without warning :(

Would it make sense to try to notice potentially broken patches? I
know that kind of path is fraught with tears, but two ideas:

  - Double-check that the trailers are actually in the created commit,
and if not, sound the alarm, because something is not OK somewhere.

  - Perhaps a new case in that `if...elif...elif` with a pattern like
`^--- +\n`. Or perhaps even an `else` that warns if things look odd?

Thanks!

Cheers,
Miguel

Re: `b4` drops added trailers with peculiar patch

[Konstantin Ryabitsev]

On Sun, Jan 04, 2026 at 09:10:44PM +0100, Miguel Ojeda wrote:
> I just noticed that trying to use `shazam` on:
> 
>   https://lore.kernel.org/rust-for-linux/20251201165601.31484-1-atharvd440@gmail.com/
> 
> would not add the trailers, including Link, SoB, etc.

Thanks for the report. I haven't ignored it, I swear!
(Well, I have, but not permanently.)

bugspray tag b4/shazam

-- 
KR

Re: `b4` drops added trailers with peculiar patch

[B4 Bugbot]

Hello:

This conversation is now tracked by b4 bug tracker.
There is no need to do anything else, just keep talking.

--
Deet-doot-dot, I am a bot.
b4 bug tracker (bugspray 0.1-dev)

Re: `b4` drops added trailers with peculiar patch

[Miguel Ojeda]

On Fri, Mar 6, 2026 at 1:58 AM Konstantin Ryabitsev
<konstantin@linuxfoundation.org> wrote:
>
> Thanks for the report. I haven't ignored it, I swear!
> (Well, I have, but not permanently.)

Thanks for taking a look! Glad to see `b4` getting more and more
robust over time :)

Cheers,
Miguel

Re: `b4` drops added trailers with peculiar patch

[B4 Bugbot]

Konstantin Ryabitsev writes in commit 6cf7adf5876a65bc019fc91aa5add0d4fd409790:

Allow trailing whitespace in patch separator line

When a patch message contains "--- " (with trailing space) instead
of a clean "---", get_body_parts() failed to split the message
correctly. This caused any follow-up trailers (Reviewed-by, Link,
Signed-off-by, etc.) to be placed after the separator, where git-am
silently discards them.

Change the regex from "^---\n" to "^---\s*\n" so trailing whitespace
on the separator line is tolerated. The rebuild_message() method
always writes a clean "---\n", so the whitespace is cleaned up
automatically.

Reported-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Closes: https://msgid.link/CANiq72nLuYfoVnWGjmEmUJDKSpFJq9wUXfTND1e3cjwhe0KFFQ@mail.gmail.com # 9453f65
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Assisted-by: claude-opus-4-6

--
Deet-doot-dot, I am a bot.
b4 bug tracker (bugspray 0.1-dev)