Re: b4 prep HEAD fails when specifying branch point

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

On Tue, Dec 06, 2022 at 08:11:00PM -0500, Konstantin Ryabitsev wrote:
> On Tue, Dec 06, 2022 at 10:58:05PM +0000, Mark Brown wrote:

> - if you specify a fork-point that's past the start of the series, we will run
>   into trouble because we will end up with multiple cover letter commits in
>   the history
> - if you specify a fork-point that exists on multiple branches, we'll need
>   some logic to make sure that we don't use another prep branch as our
>   tracking branch -- but only when we use non-default cover letter storage
>   strategies

> Since my primary goal with this work is to simplify the process for newbies
> and occasional committers, b4 tries to enforce the workflow of 1) switch to
> the branch from which you want to fork, b) specify the tag in this branch that
> you want to use as the fork-point.

Right, so a common use case here is that you want to fork from a remote
branch (generally something in the maintainer's tree).  For me that'd
probably mean that I'd end up with a lot of branches tracking a branch
called tmp.  I'm not sure if that *matters* though.

> I may either add the logic above, or just give a less obtuse error message,
> such as:

>     CRITICAL: This appears to already be a b4-prep managed branch.
>               To avoid possible ambiguity, please switch to the branch
>               on which you want to base your work and then try again.

> Or a bit of both.

That'd make it clear that it's an intentional decision which would be
good.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]