Merge branch 'mb/filter-branch-optim'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:32 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:32 +0000 (12:20 -0700)
commit676c7e50b10f1fbb2ce06e46260f15f3a20679f7
treeefc43befda409ef7c1faa60789397c352670aa98
parent36b37afda6487113a981b036431fa97aa3fe2234
parent709cfe848ad2312f80e6f4f7a27aa5d23992a0e3
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
git-filter-branch.sh
t/t7003-filter-branch.sh