fix(core): negated gitignore patterns inside subdirectories are not including matched files #35511
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.
Issue # (if applicable)
Closes #9146
Reason for this change
When bundling assets with
IgnoreMode.GIT
, files that should be included via negation patterns (like!*.html
) are incorrectly excluded if they're inside directories that are also re-included by negation patterns. Here's an example - consider the following tree:If we use a
exclude
pattern of['*', '!*.html', '!*/']
, theindex.html
in the root and both HTML files from theapp
folder should be included - theapp
folder shouldn't be excluded, due to the!*/
pattern. Right now, only theindex.html
file in the root folder is included.Description of changes
Similar to #22002, I've updated the
completelyIgnores
logic that's used to check if we need to skip a directory tree to include a trailing slash before verifying whether it's an ignored pattern. This makes it properly match directory-specific negation patterns like!*/
by ensuring we're checking directory paths (with trailing slashes) against directory patterns.I've also updated the logic in
fingerprint
to check if we're ignoring directories or files, and callcompletelyIgnores
orignores
accordingly.Describe any new or updated permissions being added
None.
Description of how you validated changes
Added unit tests covering the described scenarios.
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license