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

SZEDER Gábor· Nov 23, 2015, 12:23 UTC · lore

'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.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 git-filter-branch.sh     | 2 +-
 t/t7003-filter-branch.sh | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Show changes to 2 files +8 −1

git-filter-branch.sh, t/t7003-filter-branch.sh

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 27c9c54fbd..cefd1452c6 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -349,7 +349,7 @@ while read commit parents; do
 			die "tree filter failed: $filter_tree"
 
 		(
-			git diff-index -r --name-only --ignore-submodules $commit &&
+			git diff-index -r --name-only --ignore-submodules $commit -- &&
 			git ls-files --others
 		) > "$tempdir"/tree-state || exit
 		git update-index --add --replace --remove --stdin \
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 377c648e04..869e0bf073 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -418,4 +418,11 @@ test_expect_success 'filter commit message without trailing newline' '
 	test_cmp expect actual
 '
 
+test_expect_success 'tree-filter deals with object name vs pathname ambiguity' '
+	test_when_finished "git reset --hard original" &&
+	ambiguous=$(git rev-list -1 HEAD) &&
+	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
+	git show HEAD:$ambiguous
+'
+
 test_done

-- 
2.6.3.416.g766831e

Jeff King· Nov 24, 2015, 23:38 UTC · re: SZEDER Gábor · lore

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

On Mon, Nov 23, 2015 at 01:23:16PM +0100, SZEDER Gábor wrote:

Show 14 quoted lines

> '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

patchfilter-branch: deal with object name vs. pathname ambiguity in tree-filter