filter-branch: Fix to allow replacing submodules with another content

wentasah · gitster · commit 03ca839537c9 · 2010-01-28T13:49:53.000-08:00
When git filter-branch is used to replace a submodule with another
content, it always fails on the first commit.

Consider a repository with submod directory containing a submodule.  The
following command to remove the submodule and replace it with a file fails:

    git filter-branch --tree-filter 'rm -rf submod &amp;&amp;
                                     git rm -q submod &amp;&amp;
                                     mkdir submod &amp;&amp;
                                     touch submod/file'

with an error:

    error: submod: is a directory - add files inside instead

The reason is that git diff-index, which generates the first part of the
list of files updated by the tree filter, emits also the removed submodule
even if it was replaced by a real directory.

Signed-off-by: Michal Sojka &lt;sojkam1@fel.cvut.cz&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
@@ -331,7 +331,7 @@ while read commit parents; do
 			die "tree filter failed: $filter_tree"
 
 		(
-			git diff-index -r --name-only $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 \

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ while read commit parents; do`
`331`	`331`	`die "tree filter failed: $filter_tree"`
`332`	`332`
`333`	`333`	`(`
`334`		`- git diff-index -r --name-only $commit &&`
	`334`	`+ git diff-index -r --name-only --ignore-submodules $commit &&`
`335`	`335`	`git ls-files --others`
`336`	`336`	`) > "$tempdir"/tree-state \|\| exit`
`337`	`337`	`git update-index --add --replace --remove --stdin \`