Merge branch 'kb/maint-filter-branch-disappear'

* kb/maint-filter-branch-disappear: filter-branch: handle "disappearing tree" case correctly in subdir filter