b4 prep (via pipx) does not recognize branch on >=0.14.1

b4 prep (via pipx) does not recognize branch on >=0.14.1

[Krzysztof Kozlowski]

Hi,

I updated my b4 to 0.14.2 and noticed errors - b4 prep did not want to
work on prep-ed branch:
------------
git co next-20251023
b4 prep -n asoc-regmap-irq-chip
(I see commit "EDITME: cover title for asoc-regmap-irq-chip")
b4 prep --edit-cover
CRITICAL: This is not a prep-managed branch.
------------

Adding commits after starting `b4 prep -n` did not improve.

Reproducible always on b4 0.14.1, 0.14.2 and 0.14.3.
Works fine on b4 0.14.0.

b4 0.14.1+ also refuses to work with branches created on 0.14.0 (so with
all branches)

It's same machine as I always use, nothing changed. b4 installed via pipx.
Ubuntu 25.04, arm64
Python 3.13.3
pipx 1.7.1

Linux kernel repo without submodules but with other worktrees.

Best regards,
Krzysztof

Re: b4 prep (via pipx) does not recognize branch on >=0.14.1

[Krzysztof Kozlowski]

On 23/10/2025 10:12, Krzysztof Kozlowski wrote:
> Hi,
> 
> I updated my b4 to 0.14.2 and noticed errors - b4 prep did not want to
> work on prep-ed branch:
> ------------
> git co next-20251023
> b4 prep -n asoc-regmap-irq-chip
> (I see commit "EDITME: cover title for asoc-regmap-irq-chip")
> b4 prep --edit-cover
> CRITICAL: This is not a prep-managed branch.
> ------------
> 
> Adding commits after starting `b4 prep -n` did not improve.
> 
> Reproducible always on b4 0.14.1, 0.14.2 and 0.14.3.
> Works fine on b4 0.14.0.
> 
> b4 0.14.1+ also refuses to work with branches created on 0.14.0 (so with
> all branches)
> 
> It's same machine as I always use, nothing changed. b4 installed via pipx.
> Ubuntu 25.04, arm64
> Python 3.13.3
> pipx 1.7.1
> 
> Linux kernel repo without submodules but with other worktrees.

I know what happened - it is .mailmap which confuses b4. linux-next has
now .mailmap entry for my address which I still use in this repo, so
after `git revert 0dac0b74c32a1cc55f508dd95478637b15f4fdb3` the b4
0.14.3 works fine.


Best regards,
Krzysztof

Re: b4 prep (via pipx) does not recognize branch on >=0.14.1

[Konstantin Ryabitsev]

On Thu, Oct 23, 2025 at 10:52:27AM +0200, Krzysztof Kozlowski wrote:
> I know what happened - it is .mailmap which confuses b4. linux-next has
> now .mailmap entry for my address which I still use in this repo, so
> after `git revert 0dac0b74c32a1cc55f508dd95478637b15f4fdb3` the b4
> 0.14.3 works fine.

Hmm... I'm confused how it works. Could you give me more info:

- what is the mailmap entry that was added?
- what is your user.email set to in that repo (git config --get user.email)
- who is the committer on the cover letter commit
  (git log --format=%ce [that-commit])

-K

Re: b4 prep (via pipx) does not recognize branch on >=0.14.1

[Krzysztof Kozlowski]

On 23/10/2025 21:56, Konstantin Ryabitsev wrote:
> On Thu, Oct 23, 2025 at 10:52:27AM +0200, Krzysztof Kozlowski wrote:
>> I know what happened - it is .mailmap which confuses b4. linux-next has
>> now .mailmap entry for my address which I still use in this repo, so
>> after `git revert 0dac0b74c32a1cc55f508dd95478637b15f4fdb3` the b4
>> 0.14.3 works fine.
> 
> Hmm... I'm confused how it works. Could you give me more info:
> 
> - what is the mailmap entry that was added?


Commit 0dac0b74c32a1cc55f508dd95478637b15f4fdb3 so:
+Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>

> - what is your user.email set to in that repo (git config --get user.email)

In repo nothing, but global gitconfig has still:
$ git config --get user.email
krzysztof.kozlowski@linaro.org

> - who is the committer on the cover letter commit
>   (git log --format=%ce [that-commit])

$ git log --format=%ce
krzysztof.kozlowski@linaro.org

But apparently mailmap affects b4, just like it affects git show:
$ git log --format=%cE
krzk@kernel.org



Best regards,
Krzysztof

Re: b4 prep (via pipx) does not recognize branch on >=0.14.1

[Konstantin Ryabitsev]

On Thu, Oct 23, 2025 at 10:12:05PM +0200, Krzysztof Kozlowski wrote:
> $ git log --format=%ce
> krzysztof.kozlowski@linaro.org
> 
> But apparently mailmap affects b4, just like it affects git show:
> $ git log --format=%cE
> krzk@kernel.org

Oh, you're right -- I messed up when I was testing it (added a .mailmap entry
in one repo, and did "git log" in another one, whoops).

I'll add --no-mailmap to the call where we're looking for the cover letter and
I'll check if anything else is going to be similarly messed up by this.

Thanks for the report.

bugspray tag me

-K

Re: b4 prep (via pipx) does not recognize branch on >=0.14.1

[Bugspray Bot]

Hello:

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

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 prep is affected by .mailmap entries

[Bugspray Bot]

Konstantin Ryabitsev writes in commit 509f56ff5c24e2ad48cd2621e54c67910ea19fc1:

ez: add --no-mailmap when limiting commits by committer

Following the principle of least surprise, new entries in .mailmap
should not affect the result of git log operations, at least not when
operating on prep-managed branches.

Reported-by: Krzysztof Kozlowski <krzk@kernel.org>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220695
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

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