From: Grant Moyer Date: Thu, 01 Oct 2026 01:23:47 GMT Subject: [PATCH v2] filter-branch: fix commit map init from state branch Message-ID: <20261001012347.3998801-1-dev@grantmoyer.com> In-Reply-To: <20260801033127.10606-1-dev@grantmoyer.com> The commit map dir is populated from the state branch assuming a "to_commit:from_commit" format, but the state branch is written with a "from_commit:to_commit" format, resulting in an inverted mapping when the map is populated from the state branch. This is especially evident when --prune-empty is used and creates commits which map to nothing; when the map dir is populated from this state on subsequent runs, git-filter-branch outputs many errors while trying to create files with empty names, like: > /usr/lib/git-core/git-filter-branch: line 305: ../map/: Is a directory This change corrects the population of the commit map dir to match the "from_commit:to_commit" format and adds/updates tests to check that the state branch is written correctly. Signed-off-by: Grant Moyer Tested-by: Michele Locati Co-authored-by: Michele Locati --- git-filter-branch.sh | 4 +++- t/t7003-filter-branch.sh | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 24fa317aaa..9aa07be6e1 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -302,7 +302,9 @@ then do case "$line" in *:*) - echo "${line%:*}" >../map/"${line#*:}";; + from_commit=${line%:*} + to_commit=${line#*:} + echo "$to_commit" >../map/"$from_commit";; *) die "Unable to load state from $state_branch:filter.map";; esac diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 86011e7b1f..cf225b0f0f 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -121,10 +121,32 @@ W=$(git rev-parse HEAD) test_expect_success 'using --state-branch to skip already rewritten commits' ' test_when_finished git reset --hard $V && git reset --hard $V && - git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD && + git filter-branch --state-branch state -f --tree-filter "exit 1" HEAD && test_cmp_rev $W HEAD ' +test_expect_success '--state-branch incremental rewrite uses the rewritten parents' ' + git init incremental && + ( + cd incremental && + mkdir sub && + test_commit first sub/file && + test_commit outside root-file && + git filter-branch --state-branch refs/state \ + --prune-empty --subdirectory-filter sub -- HEAD && + rewritten_first=$(git rev-parse HEAD) && + git reset --hard outside && + test_commit second sub/file && + git filter-branch -f --state-branch refs/state \ + --prune-empty --subdirectory-filter sub -- outside..HEAD && + test_cmp_rev $rewritten_first HEAD^ && + git show refs/state:filter.map >map && + echo "$(git rev-parse second):$(git rev-parse HEAD)" >expect && + grep "^$(git rev-parse second):" map >actual && + test_cmp expect actual + ) +' + git tag oldD HEAD~4 test_expect_success 'rewrite one branch, keeping a side branch' ' git branch modD oldD && -- 2.55.0