diff options
| author | Michael Barabanov <michael.barabanov@gmail.com> | 2018-06-26 07:07:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-27 01:44:53 +0300 |
| commit | 709cfe848ad2312f80e6f4f7a27aa5d23992a0e3 (patch) | |
| tree | cf3aea0991e10ca1bc2fd058b2b49a98e454056c /git-filter-branch.sh | |
| parent | fc54c1af3ec09bab8b8ea09768c2da4069b7f53e (diff) | |
filter-branch: skip commits present on --state-branch
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 <michael.barabanov@gmail.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 98c76ec589..10096cb999 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -360,6 +360,7 @@ while read commit parents; do git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1)) report_progress + test -f "$workdir"/../map/$commit && continue case "$filter_subdir" in "") |