Skip to content

Commit 1dc413e

Browse files
peffgitster
authored andcommitted
filter-branch: resolve $commit^{tree} in no-index case
Commit 348d4f2 (filter-branch: skip index read/write when possible, 2015-11-06) taught filter-branch to optimize out the final "git write-tree" when we know we haven't touched the tree with any of our filters. It does by simply putting the literal text "$commit^{tree}" into the "$tree" variable, avoiding a useless rev-parse call. However, when we pass this to git_commit_non_empty_tree(), it gets confused; it resolves "$commit^{tree}" itself, and compares our string to the 40-hex sha1, which obviously doesn't match. As a result, "--prune-empty" (or any custom filter using git_commit_non_empty_tree) will fail to drop an empty commit (when filter-branch is used without a tree or index filter). Let's resolve $tree to the 40-hex ourselves, so that git_commit_non_empty_tree can work. Unfortunately, this is a bit slower due to the extra process overhead: $ cd t/perf && ./run 348d4f2 HEAD p7000-filter-branch.sh [...] Test 348d4f2 HEAD -------------------------------------------------------------- 7000.2: noop filter 3.76(0.24+0.26) 4.54(0.28+0.24) +20.7% We could try to make git_commit_non_empty_tree more clever. However, the value of $tree here is technically user-visible. The user can provide arbitrary shell code at this stage, which could itself have a similar assumption to what is in git_commit_non_empty_tree. So the conservative choice to fix this regression is to take the 20% hit and give the pre-348d4f2 behavior. We still end up much faster than before the optimization: $ cd t/perf && ./run 348d4f2^ HEAD p7000-filter-branch.sh [...] Test 348d4f2^ HEAD -------------------------------------------------------------- 7000.2: noop filter 9.51(4.32+0.40) 4.51(0.28+0.23) -52.6% Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 348d4f2 commit 1dc413e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

git-filter-branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ while read commit parents; do
404404
then
405405
tree=$(git write-tree)
406406
else
407-
tree="$commit^{tree}"
407+
tree=$(git rev-parse "$commit^{tree}")
408408
fi
409409
workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
410410
"$tree" $parentstr < ../message > ../map/$commit ||

t/t7003-filter-branch.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,14 @@ test_expect_success 'prune empty collapsed merges' '
333333
test_cmp expect actual
334334
'
335335

336+
test_expect_success 'prune empty works even without index/tree filters' '
337+
git rev-list HEAD >expect &&
338+
git commit --allow-empty -m empty &&
339+
git filter-branch -f --prune-empty HEAD &&
340+
git rev-list HEAD >actual &&
341+
test_cmp expect actual
342+
'
343+
336344
test_expect_success '--remap-to-ancestor with filename filters' '
337345
git checkout master &&
338346
git reset --hard A &&

0 commit comments

Comments
 (0)