b4 shazam base-commit handling

b4 shazam base-commit handling

[Rob Herring]

Konstantin,

I found that running 'b4 shazam' doesn't honor the base-commit unless
you use the '-H' option. Is this on purpose to avoid resetting the
user's branch to something else? As I recall you had reservations
about that. That's fine, but the log is pretty confusing in that case.
For example:

$ b4 shazam https://lore.kernel.org/r/20250108-adds-spmi-pmic-peripherals-for-qcs8300-v3-0-ee94642279ff@quicinc.com
Looking up https://lore.kernel.org/r/20250108-adds-spmi-pmic-peripherals-for-qcs8300-v3-0-ee94642279ff@quicinc.com
Grabbing thread from
lore.kernel.org/all/20250108-adds-spmi-pmic-peripherals-for-qcs8300-v3-0-ee94642279ff@quicinc.com/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 3 messages in the thread
Analyzing 22 code-review messages
Checking attestation on all messages, may take a moment...
---
  ✓ [PATCH v3 1/2] arm64: dts: qcom: qcs8300: Adds SPMI support
  ✓ [PATCH v3 2/2] arm64: dts: qcom: qcs8300-ride: Enable PMIC peripherals
  ---
  ✗ No key: ed25519/quic_tingguoc@quicinc.com
  ✓ Signed: DKIM/quicinc.com
---
Total patches: 2
---
 Base: using specified base-commit f486c8aa16b8172f63bddc70116a0c897a7f3f02

^^^^^^ No it's not. If it did, there wouldn't be a merge conflict below ^^^^^

Deps: looking for dependencies matching 4 patch-ids
 Deps: Applying prerequisite patch: [PATCH v3 1/4] dt-bindings: arm:
qcom: document QCS8300 SoC and reference board
 Deps: Applying prerequisite patch: [PATCH v4 2/4] arm64: defconfig:
enable clock controller, interconnect and pinctrl for QCS8300
 Deps: Applying prerequisite patch: [PATCH v4 3/4] arm64: dts: qcom:
add QCS8300 platform
 Deps: Applying prerequisite patch: [PATCH v4 4/4] arm64: dts: qcom:
add base QCS8300 RIDE board
Applying: dt-bindings: arm: qcom: document QCS8300 SoC and reference board
Using index info to reconstruct a base tree...
M       Documentation/devicetree/bindings/arm/qcom.yaml
Falling back to patching base and 3-way merge...
Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
CONFLICT (content): Merge conflict in
Documentation/devicetree/bindings/arm/qcom.yaml
Patch failed at 0001 dt-bindings: arm: qcom: document QCS8300 SoC and
reference board
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Re: b4 shazam base-commit handling

[Konstantin Ryabitsev]

On Wed, Jan 08, 2025 at 02:58:51PM -0600, Rob Herring wrote:
> Konstantin,
> 
> I found that running 'b4 shazam' doesn't honor the base-commit unless
> you use the '-H' option. Is this on purpose to avoid resetting the
> user's branch to something else?

Right, the purpose of plain "b4 shazam" has always been to just run "git am"
on top of whatever tree is currently checked out and let the end-user deal
with any fallout of any failed merges.

> As I recall you had reservations about that.
> That's fine, but the log is pretty confusing in that case.

It's true, I'll work on removing that line when we're not paying attention to
the base-commit.

-K

bugspray tag me

Re: b4 shazam base-commit handling

[Bugspray Bot]

Hello:

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

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

Re: b4 shazam base-commit handling

[Konstantin Ryabitsev via Bugspray Bot]

Konstantin Ryabitsev writes via Kernel.org Bugzilla:

This is now fixed in 8c0f498752924b3d8ae9ee12bfdc2471c6e64515, but I forgot to tag this bug. I'll also backport it to stable-0.14.y.

View: https://bugzilla.kernel.org/show_bug.cgi?id=219672#c2
You can reply to this message to join the discussion.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (bugspray 0.1-dev)

Re: b4 shazam base-commit handling

[Rob Herring]

On Tue, Sep 30, 2025 at 5:30 PM Konstantin Ryabitsev via Bugspray Bot
<bugbot@kernel.org> wrote:
>
> Konstantin Ryabitsev writes via Kernel.org Bugzilla:
>
> This is now fixed in 8c0f498752924b3d8ae9ee12bfdc2471c6e64515, but I forgot to tag this bug. I'll also backport it to stable-0.14.y.

This broke some of my scripts. That's due to my parsing of the b4
output to get the base commit which changed. I can just fix it, but
that's obviously fragile. So what's a better solution?

What I need is to run tests on the base commit and then run tests with
a series applied (and perhaps with each patch applied 1-by-1). Then I
can get just the new warnings. b4 can select pretty random commits as
the base (e.g. tags/v6.17-2-g8ec5a066f88f), so selecting a tag doesn't
work.

Also I found that what HEAD is influences the results with shazam
-H/-M options which I find not desirable given that otherwise doesn't
depend on the worktree. I sent patches addressing that a while
back[1]. Even with those, I loop over the last 7 linux-next tags in
case the series doesn't apply. It would be nicer if b4 could try a
list of branches.

Rob

[1] https://lore.kernel.org/all/20250108231203.1209721-2-robh@kernel.org/

Re: b4 shazam base-commit handling

[Konstantin Ryabitsev]

On Thu, Oct 09, 2025 at 10:36:59AM -0500, Rob Herring wrote:
> > This is now fixed in 8c0f498752924b3d8ae9ee12bfdc2471c6e64515, but I forgot to tag this bug. I'll also backport it to stable-0.14.y.
> 
> This broke some of my scripts. That's due to my parsing of the b4
> output to get the base commit which changed. I can just fix it, but
> that's obviously fragile. So what's a better solution?

Would it help if we had something like `b4 am --show-info <msgid>` that would
just output details about the series in a column format, like:

    $ b4 am --show-info foo@bar.baz
    cover-subject: Apply something to something
    change-id: some-change-id
    base-commit: abcde...
    patches: 10
    author: Some Dev <somedev@example.com>

etc?

-K

Re: b4 shazam base-commit handling

[Rob Herring]

On Thu, Oct 9, 2025 at 5:14 PM Konstantin Ryabitsev
<konstantin@linuxfoundation.org> wrote:
>
> On Thu, Oct 09, 2025 at 10:36:59AM -0500, Rob Herring wrote:
> > > This is now fixed in 8c0f498752924b3d8ae9ee12bfdc2471c6e64515, but I forgot to tag this bug. I'll also backport it to stable-0.14.y.
> >
> > This broke some of my scripts. That's due to my parsing of the b4
> > output to get the base commit which changed. I can just fix it, but
> > that's obviously fragile. So what's a better solution?
>
> Would it help if we had something like `b4 am --show-info <msgid>` that would
> just output details about the series in a column format, like:
>
>     $ b4 am --show-info foo@bar.baz
>     cover-subject: Apply something to something
>     change-id: some-change-id
>     base-commit: abcde...
>     patches: 10
>     author: Some Dev <somedev@example.com>
>
> etc?

Yeah, that would be fine as then I can just checkout FETCH_HEAD-10.

Rob