From: Jeff King <peff@peff.net>
Date: Tue, 24 Nov 2015 23:38:13 GMT
Subject: Re: [PATCH] filter-branch: deal with object name vs. pathname ambiguity in tree-filter
Message-ID: <20151124233813.GC13872@sigill.intra.peff.net>
In-Reply-To: <1448281396-5049-1-git-send-email-szeder@ira.uka.de>

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' looks for
> changed paths by running:
> 
>   git diff-index -r --name-only --ignore-submodules $commit
> 
> which then, because of the lack of disambiguating double-dash, can't
> decide whether to treat '$commit' as revision or path and errors out.
> 
> Add that disambiguating double-dash after 'git diff-index's revision
> argument to make sure that '$commit' is interpreted as a revision.

Thanks, looks obviously correct.

-Peff