summaryrefslogtreecommitdiff
path: root/git-filter-branch.sh
diff options
context:
space:
mode:
authorMichael Barabanov <michael.barabanov@gmail.com>2018-06-26 04:07:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-26 22:44:53 (GMT)
commit709cfe848ad2312f80e6f4f7a27aa5d23992a0e3 (patch)
treecf3aea0991e10ca1bc2fd058b2b49a98e454056c /git-filter-branch.sh
parentfc54c1af3ec09bab8b8ea09768c2da4069b7f53e (diff)
downloadgit-709cfe848ad2312f80e6f4f7a27aa5d23992a0e3.zip
git-709cfe848ad2312f80e6f4f7a27aa5d23992a0e3.tar.gz
git-709cfe848ad2312f80e6f4f7a27aa5d23992a0e3.tar.bz2
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-xgit-filter-branch.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 98c76ec..10096cb 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
"")