Merge branch 'sg/filter-branch-dwim-ambiguity' into maint

Fix for a corner case in filter-branch. * sg/filter-branch-dwim-ambiguity: filter-branch: deal with object name vs. pathname ambiguity in tree-filter