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

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>

veillette@yahoo.ca committed Mar 31, 2008 at 09:14 UTC 6a589fda2e4759e21d66eb2e6814e32baa14beca

2 files changed +2 -2

git-filter-branch.sh

+1 -1

@@ -281,7 +281,7 @@ while read commit parents; do

281 die "Could not checkout the index"

282 # files that $commit removed are now still in the working tree;

283 # remove them, else they would be added again

284 - git clean -q -f -x

284 + git clean -d -q -f -x

285 eval "$filter_tree" < /dev/null ||

286 die "tree filter failed: $filter_tree"

287

t/t7003-filter-branch.sh

+1 -1

@@ -53,7 +53,7 @@ test_expect_success 'rewrite, renaming a specific directory' '

53 git-filter-branch -f --tree-filter "mv dir diroh || :" HEAD

54 '

56 -test_expect_failure 'test that the directory was renamed' '

56 +test_expect_success 'test that the directory was renamed' '

57 test dir/d = "$(git show HEAD:diroh/d --)" &&

58 ! test -d dir &&

59 test -d diroh &&