Add smudge/clean filters in .gitattributes files inside the affected sparse directories in test 'merge with conflict outside cone', make sure it behaves as expected when path is outside of sparse-checkout. 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@xxxxxxxxxx> Signed-off-by: Shuqi Liang <cheskaqiqi@xxxxxxxxx> --- t/t1092-sparse-checkout-compatibility.sh | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 8a95adf4b5..839e08d8dd 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -1006,6 +1006,17 @@ test_expect_success 'merge with conflict outside cone' ' test_all_match git checkout -b merge-tip merge-left && test_all_match git status --porcelain=v2 && + + echo "a filter=rot13" >>.gitattributes && + run_on_sparse mkdir folder1 && + run_on_all cp ../.gitattributes ./folder1 && + 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 && + git config filter.rot13.clean "tr 'A-Za-z' 'N-ZA-Mn-za-m'" && + git config filter.rot13.smudge "tr 'A-Za-z' 'N-ZA-Mn-za-m'" && + test_all_match test_must_fail git merge -m merge merge-right && test_all_match git status --porcelain=v2 && @@ -2259,4 +2270,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 -- 2.39.0
