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

peff · peff · commit fe596a6a24b4 · 2015-11-24T19:31:24.000-05:00
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
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
@@ -361,7 +361,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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ while read commit parents; do`
`361`	`361`	`die "tree filter failed: $filter_tree"`
`362`	`362`
`363`	`363`	`(`
`364`		`- git diff-index -r --name-only --ignore-submodules $commit &&`
	`364`	`+ git diff-index -r --name-only --ignore-submodules $commit -- &&`
`365`	`365`	`git ls-files --others`
`366`	`366`	`) > "$tempdir"/tree-state \|\| exit`
`367`	`367`	`git update-index --add --replace --remove --stdin \`