b4 send falls over sending a series

b4 send falls over sending a series

[Mark Brown]

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

Hi,

When attempting to b4 send from the branch:

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git documentation-b4-advert 

with current git b4 the patch is sent but I get the output below and the
repository is left with the base commit checked out as a detached HEAD:

Sent 1 messages
Error tagging the revision: Could not cherry-pick the cover-less range
Recording series message-id in cover letter tracking
The current repository is not tracking a branch. To use b4, please checkout a branch.
Maybe a rebase is running?
Traceback (most recent call last):
  File "/home/broonie/git/b4/src/b4/command.py", line 435, in <module>
    cmd()
  File "/home/broonie/git/b4/src/b4/command.py", line 417, in cmd
    cmdargs.func(cmdargs)
  File "/home/broonie/git/b4/src/b4/command.py", line 93, in cmd_send
    b4.ez.cmd_send(cmdargs)
  File "/home/broonie/git/b4/src/b4/ez.py", line 2132, in cmd_send
    reroll(mybranch, tag_msg, cl_msgid)
  File "/home/broonie/git/b4/src/b4/ez.py", line 2217, in reroll
    cover, tracking = load_cover(strip_comments=False)
                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/broonie/git/b4/src/b4/ez.py", line 599, in load_cover
    cover_commit = find_cover_commit(usebranch=usebranch)
                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/broonie/git/b4/src/b4/ez.py", line 742, in find_cover_commit
    raise RuntimeError("Not currently on a branch, please checkout a b4-tracked

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

Re: b4 send falls over sending a series

[Konstantin Ryabitsev]

On Tue, Sep 03, 2024 at 11:42:21PM GMT, Mark Brown wrote:
> Hi,
> 
> When attempting to b4 send from the branch:
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git documentation-b4-advert 
> 
> with current git b4 the patch is sent but I get the output below and the
> repository is left with the base commit checked out as a detached HEAD:
> 
> Sent 1 messages
> Error tagging the revision: Could not cherry-pick the cover-less range
> Recording series message-id in cover letter tracking
> The current repository is not tracking a branch. To use b4, please checkout a branch.
> Maybe a rebase is running?
> Traceback (most recent call last):
>   File "/home/broonie/git/b4/src/b4/command.py", line 435, in <module>
>     cmd()
>   File "/home/broonie/git/b4/src/b4/command.py", line 417, in cmd
>     cmdargs.func(cmdargs)
>   File "/home/broonie/git/b4/src/b4/command.py", line 93, in cmd_send
>     b4.ez.cmd_send(cmdargs)
>   File "/home/broonie/git/b4/src/b4/ez.py", line 2132, in cmd_send
>     reroll(mybranch, tag_msg, cl_msgid)
>   File "/home/broonie/git/b4/src/b4/ez.py", line 2217, in reroll
>     cover, tracking = load_cover(strip_comments=False)
>                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>   File "/home/broonie/git/b4/src/b4/ez.py", line 599, in load_cover
>     cover_commit = find_cover_commit(usebranch=usebranch)
>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>   File "/home/broonie/git/b4/src/b4/ez.py", line 742, in find_cover_commit
>     raise RuntimeError("Not currently on a branch, please checkout a b4-tracked

bugbot assign to me

-K

Re: b4 send falls over sending a series

[Mark Brown]

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

On Tue, Sep 03, 2024 at 11:35:04PM -0400, Konstantin Ryabitsev wrote:
> On Tue, Sep 03, 2024 at 11:42:21PM GMT, Mark Brown wrote:
> > Hi,
> > 
> > When attempting to b4 send from the branch:
> > 
> >    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git documentation-b4-advert 
> > 
> > with current git b4 the patch is sent but I get the output below and the
> > repository is left with the base commit checked out as a detached HEAD:

I've now pushed this to a separate branch b4-send-crash so it doesn't
get overwriten.

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

Re: b4 send falls over sending a series

[Kernel.org Bugbot]

Hello:

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

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 send falls over sending a series

[Konstantin Ryabitsev]

On Tue, Sep 03, 2024 at 11:42:21PM GMT, Mark Brown wrote:
> Hi,
> 
> When attempting to b4 send from the branch:
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git documentation-b4-advert 
> 
> with current git b4 the patch is sent but I get the output below and the
> repository is left with the base commit checked out as a detached HEAD:
> 
> Sent 1 messages
> Error tagging the revision: Could not cherry-pick the cover-less range

Could you send a "b4 prep --show-info" for that branch?

-K

Re: b4 send falls over sending a series

[Mark Brown]

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

On Wed, Sep 04, 2024 at 08:21:32AM -0400, Konstantin Ryabitsev wrote:
> On Tue, Sep 03, 2024 at 11:42:21PM GMT, Mark Brown wrote:

> > When attempting to b4 send from the branch:

> >    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git documentation-b4-advert 

> > with current git b4 the patch is sent but I get the output below and the
> > repository is left with the base commit checked out as a detached HEAD:

> > Sent 1 messages
> > Error tagging the revision: Could not cherry-pick the cover-less range

> Could you send a "b4 prep --show-info" for that branch?

branch: tmp
cover-subject: EDITME: cover title for documentation-b4-advert
base-commit: 7c626ce4bae1ac14f60076d00eafe71af30450ba
start-commit: 85a5e5b261c5b1fb14235b3172a257eae8d1b159
end-commit: f03b085c680cce51be033f56d9702050180ef835
series-range: 85a5e5b261c5b1fb14235b3172a257eae8d1b159..f03b085c680cce51be033f56d9702050180ef835
change-id: 20240903-documentation-b4-advert-18016e83d7d9
revision: 1
cover-strategy: commit
needs-editing: False
needs-recipients: False
has-prerequisites: False
needs-auto-to-cc: False
needs-checking: False
needs-checking-deps: False
preflight-checks-failing: False
commit-f03b085c680c: docs: submitting-patches: Advertise b4

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

Re: b4 send falls over sending a series

[Konstantin Ryabitsev]

On Tue, Sep 03, 2024 at 11:42:21PM GMT, Mark Brown wrote:
> Hi,
> 
> When attempting to b4 send from the branch:
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git documentation-b4-advert 
> 
> with current git b4 the patch is sent but I get the output below and the
> repository is left with the base commit checked out as a detached HEAD:
> 
> Sent 1 messages
> Error tagging the revision: Could not cherry-pick the cover-less range

To describe what is supposed to happen here:

1. we create a detached head with the parent commit of your series at the tip
2. we cherry-pick all commits of your series and apply them at that tip;
   basically, the goal is to create the branch without the cover letter
3. we record the tip commit and switch back to your working branch
4. we tag the tip commit of that detached branch and use the cover letter
   contents as the tag message

The operation failed in your case when we tried to run this:

    git checkout 85a5e5b261c5b1fb14235b3172a257eae8d1b159~1
    git cherry-pick 85a5e5b261c5b1fb14235b3172a257eae8d1b159..f03b085c680cce51be033f56d9702050180ef835

Naturally, I cannot make it crash when doing this, so I have no idea what went
wrong. I'll work to add more debug statements there and making b4 fail better
when this happens. We should also really do this in a temporary worktree
instead of the current branch.

-K

Re: b4 send falls over sending a series

[Kernel.org Bugbot]

Konstantin Ryabitsev writes in commit 7be4fe35d52daac57b8c6df7c3cf76218add771c:

ez: use a temporary workdir when preparing sent tags

Instead of operating on the current checkout, use a temporary worktree
and a sparse checkout when preparing the tree to tag as a sent version.

Doesn't fix the bug reported, but will do a better job not leaving the
tree in a messed up stage.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=219230
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

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