b4 shazam not stripping ---

b4 shazam not stripping ---

[Andrew Cooper]

Hello,

b4 shazam 33b93fdf-bf16-49b8-aec2-0b2c19f5c471@suse.com

is leaving the notes under --- in the commit message of the finalised patch.

I cant spot anything obvious that should cause it to be mis-recognised,
although it isn't a git-written diff.  Reproduces with 0.13.y and master.

~Andrew

Re: b4 shazam not stripping ---

[Konstantin Ryabitsev]

On Thu, May 09, 2024 at 01:05:40AM GMT, Andrew Cooper wrote:
> Hello,
> 
> b4 shazam 33b93fdf-bf16-49b8-aec2-0b2c19f5c471@suse.com
> 
> is leaving the notes under --- in the commit message of the finalised patch.

We aren't doing anything beyond passing everything to "git am", so if 
this is happening, it's not really something b4 is not doing correctly.

I can't test your example above, unfortunately, because I don't know 
against which tree this patch is (I've tried xen tip, but that's not 
it).

Can you let me know what repo I need to fetch to be able to apply that 
patch?

-K

Re: b4 shazam not stripping ---

[Andrew Cooper]

On 09/05/2024 2:40 pm, Konstantin Ryabitsev wrote:
> On Thu, May 09, 2024 at 01:05:40AM GMT, Andrew Cooper wrote:
>> Hello,
>>
>> b4 shazam 33b93fdf-bf16-49b8-aec2-0b2c19f5c471@suse.com
>>
>> is leaving the notes under --- in the commit message of the finalised patch.
> We aren't doing anything beyond passing everything to "git am", so if 
> this is happening, it's not really something b4 is not doing correctly.
>
> I can't test your example above, unfortunately, because I don't know 
> against which tree this patch is (I've tried xen tip, but that's not 
> it).
>
> Can you let me know what repo I need to fetch to be able to apply that 
> patch?

It is xen tip, as long as you've pulled up master within the past 2
weeks.  I happened to be testing on top of a2330b51df2.

But if its git-am going wrong, then probably the only option is to keep
vigilance for it happening.

~Andrew

Re: b4 shazam not stripping ---

[Konstantin Ryabitsev]

On Thu, May 09, 2024 at 02:43:48PM GMT, Andrew Cooper wrote:
> > Can you let me know what repo I need to fetch to be able to apply 
> > that patch?
> 
> It is xen tip, as long as you've pulled up master within the past 2
> weeks.  I happened to be testing on top of a2330b51df2.
> 
> But if its git-am going wrong, then probably the only option is to keep
> vigilance for it happening.

No, you're actually right -- this happens before we hit git. I was able 
to recreate this with "git am".

I'll try to figure out where things are going wrong with message 
parsing. It's probably related to the fact that this is not generated 
with "git format-patch".

-K

Re: b4 shazam not stripping ---

[Konstantin Ryabitsev]

On Thu, May 09, 2024 at 01:05:40AM GMT, Andrew Cooper wrote:
> Hello,
> 
> b4 shazam 33b93fdf-bf16-49b8-aec2-0b2c19f5c471@suse.com
> 
> is leaving the notes under --- in the commit message of the finalised patch.
> 
> I cant spot anything obvious that should cause it to be mis-recognised,
> although it isn't a git-written diff.  Reproduces with 0.13.y and 
> master.

bugbot assign to me

Re: b4 shazam not stripping ---

[Kernel.org Bugbot]

Hello:

This conversation is now tracked by Kernel.org Bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=218824

There is no need to do anything else, just keep talking.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)

Re: b4 shazam not stripping ---

[Kernel.org Bugbot]

Konstantin Ryabitsev writes in commit f3d47b4f92dfbd09106b06ade5020458a339d960:

am: fix incorrect parsing of non-git diffs with comments

We were not properly handling patches that were a) not generated with
"git format-patch" and b) contained a comment after the main commit
message (where the diffstat would normally go). This fixes it and adds a
test case to make sure we catch it in the future.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218824
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

(via https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=f3d47b4f92df)
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)

Re: b4 shazam not stripping ---

[Konstantin Ryabitsev]

On Thu, May 09, 2024 at 01:05:40AM GMT, Andrew Cooper wrote:
> Hello,
> 
> b4 shazam 33b93fdf-bf16-49b8-aec2-0b2c19f5c471@suse.com
> 
> is leaving the notes under --- in the commit message of the finalised patch.
> 
> I cant spot anything obvious that should cause it to be mis-recognised,
> although it isn't a git-written diff.  Reproduces with 0.13.y and 
> master.

This should be now handled properly in master. Thank you for the report.

-K

Re: b4 shazam not stripping ---

[Andrew Cooper]

On 09/05/2024 4:05 pm, Konstantin Ryabitsev wrote:
> On Thu, May 09, 2024 at 01:05:40AM GMT, Andrew Cooper wrote:
>> Hello,
>>
>> b4 shazam 33b93fdf-bf16-49b8-aec2-0b2c19f5c471@suse.com
>>
>> is leaving the notes under --- in the commit message of the finalised patch.
>>
>> I cant spot anything obvious that should cause it to be mis-recognised,
>> although it isn't a git-written diff.  Reproduces with 0.13.y and 
>> master.
> This should be now handled properly in master. Thank you for the report.

Works for me.  TYVM.

~Andrew