filter-branch: Fix renaming a directory in the tree-filter

veillette@yahoo.ca · gitster · commit 6a589fda2e47 · 2008-03-31T01:09:50.000-07:00
Commit d89c1df (filter-branch: don't use xargs -0, 2008-03-12) replaced a 'ls-files | xargs rm' pipeline by 'git clean'. 'git clean' however does not recurse and remove directories by default. Now, consider a tree-filter that renames a directory. 1. For the first commit everything works as expected 2. Then filter-branch checks out the files for the next commit. This leaves the new directory behind because there is no real "branch switching" involved that would notice that the directory can be removed. 3. Then filter-branch invokes 'git clean' to remove exactly those left-overs. But here it does not remove the directory. 4. The next tree-filter does not work as expected because there already exists a directory with the new name. Just add -d to 'git clean', so that empty directories are removed. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
@@ -281,7 +281,7 @@ while read commit parents; do
 			die "Could not checkout the index"
 		# files that $commit removed are now still in the working tree;
 		# remove them, else they would be added again
-		git clean -q -f -x
+		git clean -d -q -f -x
 		eval "$filter_tree" < /dev/null ||
 			die "tree filter failed: $filter_tree"
 
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
@@ -53,7 +53,7 @@ test_expect_success 'rewrite, renaming a specific directory' '
 	git-filter-branch -f --tree-filter "mv dir diroh || :" HEAD
 '
 
-test_expect_failure 'test that the directory was renamed' '
+test_expect_success 'test that the directory was renamed' '
 	test dir/d = "$(git show HEAD:diroh/d --)" &&
 	! test -d dir &&
 	test -d diroh &&

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ test_expect_success 'rewrite, renaming a specific directory' '`
`53`	`53`	`git-filter-branch -f --tree-filter "mv dir diroh \|\| :" HEAD`
`54`	`54`	`'`
`55`	`55`
`56`		`-test_expect_failure 'test that the directory was renamed' '`
	`56`	`+test_expect_success 'test that the directory was renamed' '`
`57`	`57`	`test dir/d = "$(git show HEAD:diroh/d --)" &&`
`58`	`58`	`! test -d dir &&`
`59`	`59`	`test -d diroh &&`