public inbox for tools@linux.kernel.org
 help / color / mirror / Atom feed
From: Konstantin Ryabitsev <mricon@kernel.org>
To: Liam Mitchell <mitchell.liam@gmail.com>
Cc: tools@kernel.org
Subject: Re: B4 errors after changing git author
Date: Mon, 9 Feb 2026 13:29:09 -0500	[thread overview]
Message-ID: <20260209-diligent-rich-prawn-56a859@lemur> (raw)
In-Reply-To: <CAOQ1CL4neLRd4t4WZ9mR1r8rF+R7hda61dfOvXDV72u8-MWt8w@mail.gmail.com>

On Sat, Feb 07, 2026 at 05:09:26PM +0100, Liam Mitchell wrote:
> The following commands worked fine:
> $ b4 prep -n bcm5974-reset -f v6.18
> $ git cherry-pick 52007b920a7b
> $ b4 prep --edit-cover
> 
> While editing the cover letter, I noticed the author email was wrong
> and updated in git config and the latest commit:
> $ git config user.email mitchell.liam@gmail.com
> $ git commit --amend --reset-author

Yes, this is a corner-case we don't handle right now.

> $ b4 prep --edit-cover
> CRITICAL: This is not a prep-managed branch.
> 
> I figured out that the cover letter author was the problem and fixed it with:
> $ git rebase --reset-author v6.18
> 
> A more helpful error message could help the next person who stumbles into this.

Noted. This is a rare enough situation, thankfully, but we should do a quick
sanity check for all command before we attempt many operations.

-- 
KR

      reply	other threads:[~2026-02-09 18:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-07 16:09 B4 errors after changing git author Liam Mitchell
2026-02-09 18:29 ` Konstantin Ryabitsev [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260209-diligent-rich-prawn-56a859@lemur \
    --to=mricon@kernel.org \
    --cc=mitchell.liam@gmail.com \
    --cc=tools@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox