change against v3:
* update a new commit message
* update read_attr_from_index function
* The order of the patches has been rearranged to better illustrate
the problem and its solution.
1.t1092: add tests for git check-attr
2.attr.c: read attributes in a sparse directory
3.check-attr: integrate with sparse-index
The new order of patches allows us to introduce a failing test case in
the patch 1, which then hen back to "test_expect_success" in patch 2.
This approach is designed to concretely show why reading attributes
from a sparse directory is needed: without this functionality, the
sparse index case doesn't work correctly for git check-attr.
* Enhanced the comments in the code to provide more detail. Added
explanations as to why 1) it matters whether 'pos' identifies a
value that exists in the index or not, and 2) the rationale behind
looking for the sparse directory containing the path
* Add a test 'diff --check with pathspec outside sparse definition'.
It starts by disabling the trailing whitespace and space-before-tab
checks using the core.whitespace configuration option. Then, it
specifically re-enables the trailing whitespace check for a file located
in a sparse directory. This is accomplished by adding a
whitespace=trailing-space rule to the .gitattributes file within that
directory. To ensure that only the .gitattributes file in the index is
being read, and not any .gitattributes files in the working tree, the
test removes the .gitattributes file from the working tree after adding
it to the index. The final part of the test uses 'git diff --check' to
verify the correct application of the attribute rules. This ensures that
the .gitattributes file is correctly read from index and applied, even
when the file's path falls outside of the sparse-checkout definition.
* fix whitespace error
Shuqi Liang (3):
t1092: add tests for 'git check-attr'
attr.c: read attributes in a sparse directory
check-attr: integrate with sparse-index
attr.c | 60 +++++++++++++++-------
builtin/check-attr.c | 3 ++
t/perf/p2000-sparse-operations.sh | 1 +
t/t1092-sparse-checkout-compatibility.sh | 63 ++++++++++++++++++++++++
4 files changed, 109 insertions(+), 18 deletions(-)
Range-diff against v3:
1: 199cc90a5b < -: ---------- attr.c: read attributes in a sparse directory
2: eefce85083 ! 1: 9c43eea9cc t1092: add tests for `git check-attr`
@@ Metadata
Author: Shuqi Liang <cheskaqiqi@xxxxxxxxx>
## Commit message ##
- t1092: add tests for `git check-attr`
+ t1092: add tests for 'git check-attr'
- 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 attribute file does get read
+ from index when path is either inside or outside of sparse-checkout
+ definition.
- Add tests for `git check-attr`, make sure it behaves as expected when
- path is both inside or outside of sparse-checkout definition.
+ Add a test named 'diff --check with pathspec outside sparse definition'.
+ It starts by disabling the trailing whitespace and space-before-tab
+ checks using the core.whitespace configuration option. Then, it
+ specifically re-enables the trailing whitespace check for a file located
+ in a sparse directory. This is accomplished by adding a
+ whitespace=trailing-space rule to the .gitattributes file within that
+ directory. To ensure that only the .gitattributes file in the index is
+ being read, and not any .gitattributes files in the working tree, the
+ test removes the .gitattributes file from the working tree after adding
+ it to the index. The final part of the test uses 'git diff --check' to
+ verify the correct application of the attribute rules. This ensures that
+ the .gitattributes file is correctly read from index and applied, even
+ when the file's path falls outside of the sparse-checkout definition.
Helped-by: Victoria Dye <vdye@xxxxxxxxxx>
Signed-off-by: Shuqi Liang <cheskaqiqi@xxxxxxxxx>
## t/t1092-sparse-checkout-compatibility.sh ##
-@@ t/t1092-sparse-checkout-compatibility.sh: 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 &&
-
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'worktree is not expanded' '
ensure_not_expanded worktree remove .worktrees/hotfix
'
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'worktree is not e
+ test_all_match git check-attr -a --cached -- deep/a
+'
+
-+test_expect_success 'check-attr with pathspec outside sparse definition' '
++test_expect_failure 'check-attr with pathspec outside sparse definition' '
+ init_repos &&
+
+ echo "a -crlf myAttr" >>.gitattributes &&
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'worktree is not e
+ test_sparse_match git sparse-checkout reapply &&
+ test_all_match git check-attr -a --cached -- folder1/a
+'
++
++test_expect_failure 'diff --check with pathspec outside sparse definition' '
++ init_repos &&
++
++ write_script edit-contents <<-\EOF &&
++ echo "a " >"$1"
++ EOF
++
++ git config core.whitespace -trailing-space,-space-before-tab &&
++
++ echo "a whitespace=trailing-space,space-before-tab" >>.gitattributes &&
++ run_on_all mkdir -p 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 rm folder1/.gitattributes &&
++ run_on_all ../edit-contents folder1/a &&
++ test_all_match test_must_fail git diff --check -- folder1/a
++'
+
test_done
-: ---------- > 2: 63ff110b1c attr.c: read attributes in a sparse directory
3: 65c2624504 ! 3: 7a9c2da30d check-attr: integrate with sparse-index
@@ Metadata
## Commit message ##
check-attr: integrate with sparse-index
- Set the requires-full-index to false for "diff-tree".
+ Set the requires-full-index to false for "check-attr".
Add a test to ensure that the index is not expanded whether the files
are outside or inside the sparse-checkout cone when the sparse index is
@@ t/perf/p2000-sparse-operations.sh: test_perf_on_all git diff-files -- $SPARSE_CO
test_done
## t/t1092-sparse-checkout-compatibility.sh ##
-@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'check-attr with pathspec outside sparse definition' '
- test_all_match git check-attr -a --cached -- folder1/a
+@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'diff --check with pathspec outside sparse definition' '
+ test_all_match test_must_fail git diff --check -- folder1/a
'
+test_expect_success 'sparse-index is not expanded: check-attr' '
--
2.39.0
