mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 19:16:28 +02:00
Code

Merge branch 'jk/filter-branch-no-index' into maint 

A recent optimization to filter-branch in v2.7.0 introduced a
regression when --prune-empty filter is used, which has been
corrected.

* jk/filter-branch-no-index:
  filter-branch: resolve $commit^{tree} in no-index case
This commit is contained in:
Junio C Hamano 2016-02-05 14:54:13 -08:00
parent f748e69167 1dc413ebe5
commit 16f5e26833
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-filter-branch.sh
View File

@ -404,7 +404,7 @@ while read commit parents; do
then
tree=$(git write-tree)
else
tree="$commit^{tree}"
tree=$(git rev-parse "$commit^{tree}")
fi
workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
"$tree" $parentstr < ../message > ../map/$commit ||

8
t/t7003-filter-branch.sh
View File

@ -333,6 +333,14 @@ test_expect_success 'prune empty collapsed merges' '
test_cmp expect actual
'
test_expect_success 'prune empty works even without index/tree filters' '
git rev-list HEAD >expect &&
git commit --allow-empty -m empty &&
git filter-branch -f --prune-empty HEAD &&
git rev-list HEAD >actual &&
test_cmp expect actual
'
test_expect_success '--remap-to-ancestor with filename filters' '
git checkout master &&
git reset --hard A &&