Fix sparse path matching #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cmbartschat
force-pushed
the
cbartschat-cone
branch
from
28ee79e
to
a781b9b
Compare
erikmchut
reviewed
Jan 29, 2024
src/libgit2/sparse.c
Outdated
| } | ||
|
|
||
| if (match->length == 1 && match->pattern[0] == '*') { | ||
| // NOTE(christoph): "/*" and "!/*/" both parse to "*", either to: |
There was a problem hiding this comment.
You can remove your name from the note
src/libgit2/sparse.c
Outdated
| int *checkout, | ||
| git_attr_file *file, | ||
| git_attr_path *path) | ||
| { | ||
| size_t j; | ||
| git_attr_fnmatch *match; | ||
|
|
||
| int path_length = strlen(path->path); | ||
| if (is_top_level_file(path) ) { | ||
| *checkout =GIT_SPARSE_CHECKOUT; |
There was a problem hiding this comment.
Looks like there is some tabs vs. spaces thing going on here leading to non-consistent whitespace.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
There was unexpected behavior on the following sparse checkout file:
Part of the problem is that prefixes like
example/were not matching any of the include rules, so we never recursed into theexample/a/directory for example.This prompted an investigation into no-cone vs cone and based on our reading of https://git-scm.com/docs/git-sparse-checkout, it's a better idea going forward to simply commit to cone mode.
Testing
make libgit2_tests && ./libgit2_tests -ssparse::pathsWith:
The "A" folder becomes present in the workdir, with the "B" folder inside that, but "C" doesn't appear.
It seems like git operates as if
is equivalent to
but
by itself is ignored altogether.
Or maybe it's a path matching bug that intersects weirdly with the "always checkout top level files" rule.
Potentially some more experimentation needed, but bottom line, we now have a sane mental model on sparse matching as long as parent folders are included. I can also follow up to add a check for that.