[PATCH] Add test for filter-branch on a subdirectory that's been added and deleted and re-added
Add a currently-failing test for the case when git-filter-branch
is run with the --subdirectory-filter referencing a folder that
has been added, deleted, and re-added. Such an action should work,
but as this test shows it ends up blowing up.
---
t/t7003-filter-branch.sh | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 868babc..933157b 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -179,4 +179,17 @@ test_expect_success 'Name needing quotes' '
'
+test_expect_success 'Subdirectory filter on folder with non-contiguous history' '
+ mkdir foo &&
+ touch foo/bar &&
+ git add foo &&
+ git commit -m "Adding foo" &&
+ git rm -r foo &&
+ git commit -m "Removing foo" &&
+ mkdir foo &&
+ touch foo/bar &&
+ git commit -m "Re-adding foo" &&
+ git filter-branch --subdirectory-filter foo
+'
+
test_done
--
1.5.4.3.487.g5a92
Kevin Ballard <kevin@sb.org>