Charles Bailey <char...@hashpling.org> writes: > +test_expect_success 'grep can find things only in the work tree' ' > + : >work-tree-only && > + git add work-tree-only && > + test_when_finished "git rm -f work-tree-only" &&
It is better to have the test_when_finished before "git add", and possibly before the creation of the test file. It is not worth a reroll and it is perfectly fine to leave it as a low-hanging-fruit for later clean-up material, because this test is not about catchign a "git add" that suddenly starts failing in a strange way (e.g. adds to the index but exits with non-zero). Same comment for the use of test_when_finished in the remainder of the patch. Thanks. > + echo "find in work tree" >work-tree-only && > + git grep --quiet "find in work tree" && > + test_must_fail git grep --quiet --cached "find in work tree" && > + test_must_fail git grep --quiet "find in work tree" HEAD > +' > + > +test_expect_success 'grep can find things only in the work tree (i-t-a)' ' > + echo "intend to add this" >intend-to-add && > + git add -N intend-to-add && > + test_when_finished "git rm -f intend-to-add" && > + git grep --quiet "intend to add this" && > + test_must_fail git grep --quiet --cached "intend to add this" && > + test_must_fail git grep --quiet "intend to add this" HEAD > +' > + > +test_expect_success 'grep does not search work tree with assume unchanged' ' > + echo "intend to add this" >intend-to-add && > + git add -N intend-to-add && > + git update-index --assume-unchanged intend-to-add && > + test_when_finished "git rm -f intend-to-add" && > + test_must_fail git grep --quiet "intend to add this" && > + test_must_fail git grep --quiet --cached "intend to add this" && > + test_must_fail git grep --quiet "intend to add this" HEAD > +' > + > +test_expect_success 'grep can find things only in the index' ' > + echo "only in the index" >cache-this && > + git add cache-this && > + rm cache-this && > + test_when_finished "git rm --cached cache-this" && > + test_must_fail git grep --quiet "only in the index" && > + git grep --quiet --cached "only in the index" && > + test_must_fail git grep --quiet "only in the index" HEAD > +' > + > +test_expect_success 'grep does not report i-t-a with -L --cached' ' > + echo "intend to add this" >intend-to-add && > + git add -N intend-to-add && > + test_when_finished "git rm -f intend-to-add" && > + git ls-files | grep -v "^intend-to-add\$" >expected && > + git grep -L --cached "nonexistent_string" >actual && > + test_cmp expected actual > +' > + > +test_expect_success 'grep does not report i-t-a and assume unchanged with > -L' ' > + echo "intend to add this" >intend-to-add-assume-unchanged && > + git add -N intend-to-add-assume-unchanged && > + test_when_finished "git rm -f intend-to-add-assume-unchanged" && > + git update-index --assume-unchanged intend-to-add-assume-unchanged && > + git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected && > + git grep -L "nonexistent_string" >actual && > + test_cmp expected actual > +' > + > test_done -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
