Commit 676c7e50 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'mb/filter-branch-optim'

"git filter-branch" when used with the "--state-branch" option
still attempted to rewrite the commits whose filtered result is
known from the previous attempt (which is recorded on the state
branch); the command has been corrected not to waste cycles doing
so.

* mb/filter-branch-optim:
  filter-branch: skip commits present on --state-branch
parents 36b37afd 709cfe84
...@@ -372,6 +372,7 @@ while read commit parents; do ...@@ -372,6 +372,7 @@ while read commit parents; do
git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1)) git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
report_progress report_progress
test -f "$workdir"/../map/$commit && continue
case "$filter_subdir" in case "$filter_subdir" in
"") "")
......
...@@ -107,6 +107,21 @@ test_expect_success 'test that the directory was renamed' ' ...@@ -107,6 +107,21 @@ test_expect_success 'test that the directory was renamed' '
test dir/D = "$(cat diroh/D.t)" test dir/D = "$(cat diroh/D.t)"
' '
V=$(git rev-parse HEAD)
test_expect_success 'populate --state-branch' '
git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
'
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 &&
test_cmp_rev $W HEAD
'
git tag oldD HEAD~4 git tag oldD HEAD~4
test_expect_success 'rewrite one branch, keeping a side branch' ' test_expect_success 'rewrite one branch, keeping a side branch' '
git branch modD oldD && git branch modD oldD &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment