Re: [PATCH] filter-branch: deal with object name vs. pathname ambiguity in tree-filter

2015-11-24 Thread Jeff King
On Mon, Nov 23, 2015 at 01:23:16PM +0100, SZEDER Gábor wrote: > 'git filter-branch' fails complaining about an ambiguous argument, if > a tree-filter renames a path and the new pathname happens to match an > existing object name. > > After the tree-filter has been applied, 'git filter-branch' loo

[PATCH] filter-branch: deal with object name vs. pathname ambiguity in tree-filter

2015-11-23 Thread SZEDER Gábor
'git filter-branch' fails complaining about an ambiguous argument, if a tree-filter renames a path and the new pathname happens to match an existing object name. After the tree-filter has been applied, 'git filter-branch' looks for changed paths by running: git diff-index -r --name-only --ignor