| Message ID | 20230701064843.147496-3-cheskaqiqi@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | check-attr: integrate with sparse-index | expand |
Shuqi Liang wrote: > Add tests for `git check-attr`, make sure it behaves as expected when > path is both inside or outside of sparse-checkout definition. > > Helped-by: Victoria Dye <vdye@github.com> > Signed-off-by: Shuqi Liang <cheskaqiqi@gmail.com> > --- > t/t1092-sparse-checkout-compatibility.sh | 29 ++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh > index 8a95adf4b5..4edfa3c168 100755 > --- a/t/t1092-sparse-checkout-compatibility.sh > +++ b/t/t1092-sparse-checkout-compatibility.sh > @@ -2259,4 +2259,33 @@ test_expect_success 'worktree is not expanded' ' > ensure_not_expanded worktree remove .worktrees/hotfix > ' > > +test_expect_success 'check-attr with pathspec inside sparse definition' ' > + init_repos && > + > + echo "a -crlf myAttr" >>.gitattributes && > + run_on_all cp ../.gitattributes ./deep && > + > + test_all_match git check-attr -a -- deep/a && First, ensure 'check-attr' reads the attributes in the untracked .gitattributes... > + > + test_all_match git add deep/.gitattributes && > + test_all_match git check-attr -a --cached -- deep/a Then, once .gitattributes is in the index, 'check-attr --cached' reads the attributes from the index. Makes sense. > +' > + > +test_expect_success 'check-attr with pathspec outside sparse definition' ' > + init_repos && > + > + echo "a -crlf myAttr" >>.gitattributes && > + run_on_sparse mkdir folder1 && > + run_on_all cp ../.gitattributes ./folder1 && > + run_on_all cp a folder1/a && > + > + test_all_match git check-attr -a -- folder1/a && This test starts the same way as the last, ensuring a .gitattributes file on disk is read. The difference is, this one is outside the sparse cone; without the previous patch [1], this would not work correctly. Good! [1] https://lore.kernel.org/git/20230701064843.147496-2-cheskaqiqi@gmail.com/ > + > + git -C full-checkout add folder1/.gitattributes && > + run_on_sparse git add --sparse folder1/.gitattributes && > + run_on_all git commit -m "add .gitattributes" && > + test_sparse_match git sparse-checkout reapply && > + test_all_match git check-attr -a --cached -- folder1/a Now, add the file to the index and reapply the sparse-checkout patterns. In both 'sparse-checkout' and 'sparse-index', the file is removed from disk; in 'sparse-index', the file is now contained in a sparse directory. Despite this, the attributes are still read correctly by 'check-attr --cached'. These tests look great to me! > +' > + > test_done
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 8a95adf4b5..4edfa3c168 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -2259,4 +2259,33 @@ test_expect_success 'worktree is not expanded' ' ensure_not_expanded worktree remove .worktrees/hotfix ' +test_expect_success 'check-attr with pathspec inside sparse definition' ' + init_repos && + + echo "a -crlf myAttr" >>.gitattributes && + run_on_all cp ../.gitattributes ./deep && + + test_all_match git check-attr -a -- deep/a && + + test_all_match git add deep/.gitattributes && + test_all_match git check-attr -a --cached -- deep/a +' + +test_expect_success 'check-attr with pathspec outside sparse definition' ' + init_repos && + + echo "a -crlf myAttr" >>.gitattributes && + run_on_sparse mkdir folder1 && + run_on_all cp ../.gitattributes ./folder1 && + run_on_all cp a folder1/a && + + test_all_match git check-attr -a -- folder1/a && + + git -C full-checkout add folder1/.gitattributes && + run_on_sparse git add --sparse folder1/.gitattributes && + run_on_all git commit -m "add .gitattributes" && + test_sparse_match git sparse-checkout reapply && + test_all_match git check-attr -a --cached -- folder1/a +' + test_done
Add tests for `git check-attr`, make sure it behaves as expected when path is both inside or outside of sparse-checkout definition. Helped-by: Victoria Dye <vdye@github.com> Signed-off-by: Shuqi Liang <cheskaqiqi@gmail.com> --- t/t1092-sparse-checkout-compatibility.sh | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+)