diff options
| author | veillette@yahoo.ca <veillette@yahoo.ca> | 2008-03-31 09:14:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-31 01:09:50 -0700 |
| commit | 6a589fda2e4759e21d66eb2e6814e32baa14beca (patch) | |
| tree | a9390a25e666eba12681ded584df47408ee731c0 | |
| parent | 90356287e65181caeaa821d7476b8865d26bc588 (diff) | |
| download | git-6a589fda2e4759e21d66eb2e6814e32baa14beca.tar.gz git-6a589fda2e4759e21d66eb2e6814e32baa14beca.tar.xz | |
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>
| -rwxr-xr-x | git-filter-branch.sh | 2 | ||||
| -rwxr-xr-x | t/t7003-filter-branch.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 22b6ed4a7..ea59015ba 100755 --- 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 index 53b5ce605..efd658adb 100755 --- 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 && |