diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:32 -0700 |
| commit | 676c7e50b10f1fbb2ce06e46260f15f3a20679f7 (patch) | |
| tree | efc43befda409ef7c1faa60789397c352670aa98 /git-filter-branch.sh | |
| parent | Merge branch 'dj/runtime-prefix' (diff) | |
| parent | filter-branch: skip commits present on --state-branch (diff) | |
| download | git-676c7e50b10f1fbb2ce06e46260f15f3a20679f7.tar.xz git-676c7e50b10f1fbb2ce06e46260f15f3a20679f7.zip | |
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
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 ccceaf19a74..5c5afa2b985 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__commit_count+1)) report_progress + test -f "$workdir"/../map/$commit && continue case "$filter_subdir" in "") |