From: Michele Locati <michele@locati.it>
To: dev@grantmoyer.com
Cc: git@vger.kernel.org, ps@pks.im, gitster@pobox.com
Subject: Re: [PATCH] fiter-branch: fix commit map init from state branch
Date: Tue, 29 Sep 2026 16:31:50 +0200 [thread overview]
Message-ID: <20260929143150.2420-1-michele@locati.it> (raw)
In-Reply-To: <20260801033127.10606-1-dev@grantmoyer.com>
Hi Grant,
thanks for this patch: I hit the same bug, and I was about to report it.
Cc'ing Patrick and Junio, since the problem was introduced by
f6d855091e (filter-branch: stop depending on Perl, 2025-04-16),
released in 2.50.0.
I tested your fix with git 2.56.0, running filter-branch incrementally
with --state-branch, --prune-empty and --subdirectory-filter:
- without the fix, the new commits are attached to the original
parents instead of the rewritten ones, and swapped entries are saved
back to the state branch;
- with the fix, the parents are the rewritten commits and the state
is saved correctly.
Tested-by: Michele Locati <michele@locati.it>
We know that the use of filter-branch is not recommended, but we rely
on --state-branch to split a repository incrementally, that is,
processing only the new commits instead of the whole history at every
run.
It would be great to have this fix merged.
A minor note: there's a typo in the subject ("fiter-branch").
Thanks,
Michele
next prev parent reply other threads:[~2026-09-29 14:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-01 3:31 [PATCH] fiter-branch: fix commit map init from state branch Grant Moyer
2026-09-29 14:31 ` Michele Locati [this message]
2026-09-30 14:40 ` Patrick Steinhardt
2026-09-30 15:48 ` Grant Moyer
2026-09-30 16:08 ` Patrick Steinhardt
2026-09-30 20:38 ` Michele Locati
2026-10-01 1:23 ` [PATCH v2] filter-branch: " Grant Moyer
2026-10-01 5:36 ` Patrick Steinhardt
2026-10-01 6:33 ` Michele Locati
2026-10-01 16:10 ` Junio C Hamano
2026-10-03 1:01 ` [PATCH v3] " Grant Moyer
2026-10-05 6:11 ` Patrick Steinhardt
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=20260929143150.2420-1-michele@locati.it \
--to=michele@locati.it \
--cc=dev@grantmoyer.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
/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