Ian Campbell <[email protected]> writes: > On Mon, 2018-06-25 at 21:07 -0700, Michael Barabanov wrote: >> The commits in state:filter.map have already been processed, so don't >> filter them again. This makes incremental git filter-branch much >> faster. >> >> Also add tests for --state-branch option. >> >> Signed-off-by: Michael Barabanov <[email protected]> > > Acked-by: Ian Campbell <[email protected]>
Thanks. > >> --- >> git-filter-branch.sh | 1 + >> t/t7003-filter-branch.sh | 15 +++++++++++++++ >> 2 files changed, 16 insertions(+) >> >> diff --git a/git-filter-branch.sh b/git-filter-branch.sh >> index ccceaf19a..5c5afa2b9 100755 >> --- a/git-filter-branch.sh >> +++ b/git-filter-branch.sh >> @@ -372,6 +372,7 @@ while read commit parents; do >> git_filter_branch__commit_count=$(($git_filter_branch__commi >> t_count+1)) >> >> report_progress >> + test -f "$workdir"/../map/$commit && continue >> >> case "$filter_subdir" in >> "") >> diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh >> index ec4b160dd..e23de7d0b 100755 >> --- a/t/t7003-filter-branch.sh >> +++ b/t/t7003-filter-branch.sh >> @@ -107,6 +107,21 @@ test_expect_success 'test that the directory was >> renamed' ' >> 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 >> test_expect_success 'rewrite one branch, keeping a side branch' ' >> git branch modD oldD &&
