Kevin Ballard <kevin@xxxxxx> writes: > 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. Such a test is a very good incentive to the people involved in the failing part of the system to fix, and is greatly appreciated. However, * please mark "currently-failing" test with "test_expect_failure"; * please hint (after --- lines) if you will shortly be following up with a fix patch yourself, or if you are only reporting a bug. I can fix-up and forge your Sign-off. > 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 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html