From: Dave Marquardt <davemarq@linux.ibm.com>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: "Kernel.org Tools" <tools@kernel.org>
Subject: Re: [PATCH b4] prep: Make `b4 prep --edit-cover` remove already_ran file under $GIT_DIR
Date: Fri, 20 Mar 2026 15:16:49 -0500 [thread overview]
Message-ID: <87a4w2cl3i.fsf@linux.ibm.com> (raw)
In-Reply-To: <20260320-ambitious-hoatzin-of-argument-0b1d72@lemur> (Konstantin Ryabitsev's message of "Fri, 20 Mar 2026 16:05:42 -0400")
Konstantin Ryabitsev <konstantin@linuxfoundation.org> writes:
> On Fri, Mar 20, 2026 at 02:57:24PM -0500, Dave Marquardt via B4 Relay wrote:
>> From: Dave Marquardt <davemarq@linux.ibm.com>
>>
>>
>>
>> ---
>> The `b4 prep --edit-cover` code calls git-filter-repo to update the
>> cover letter. When using a Git worktree, the user may get a confusing
>> message like
>
> (Unrelated to the patch contents.)
>
> I wonder how this happened? Is the content below '---' just the cover letter
> and the commit itself is without any message?
I feel like we've had this conversation a previous time I submitted a
patch, several months ago. Yes, I think you're correct, the actual
commit doesn't have a message. I also recall you looking at this before
and I thought you had attempted to fix it.
>> Invoking git-filter-repo to update the cover letter.
>> The previous run is older than a day (/home/davemarq/linux/linux/.git/worktrees/ibmvfc-fpin-bis/filter-repo/already_ran already exists).
>> See "Already Ran" section in the manual for more information.
>> Treat this run as a continuation of filtering in the previous run (Y/N)? n
>>
>> There's code in run_frf() that removes
>> <top-level>/.git/filter-repo/already_ran, which may have been left
>> behind by git-filter-repo. This doesn't work for Git worktrees, where
>> the file is $GIT_DIR/filter-repo/already_ran. GIT_DIR is set to a
>> worktree-unique directory under the repository top level directory in
>> the worktree case. This update uses $GIT_DIR, which works for both
>> repositories and worktrees.
>>
>> Signed-off-by: Dave Marquardt <davemarq@linux.ibm.com>
>> ---
>> src/b4/__init__.py | 10 ++++++++++
>> src/b4/ez.py | 8 ++++----
>> 2 files changed, 14 insertions(+), 4 deletions(-)
next prev parent reply other threads:[~2026-03-20 20:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 19:57 [PATCH b4] prep: Make `b4 prep --edit-cover` remove already_ran file under $GIT_DIR Dave Marquardt via B4 Relay
2026-03-20 20:05 ` Konstantin Ryabitsev
2026-03-20 20:16 ` Dave Marquardt [this message]
2026-03-20 20:21 ` Konstantin Ryabitsev
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=87a4w2cl3i.fsf@linux.ibm.com \
--to=davemarq@linux.ibm.com \
--cc=konstantin@linuxfoundation.org \
--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