fix(core): negated gitignore patterns inside subdirectories are not including matched files#35511
Merged
mergify[bot] merged 3 commits intoaws:mainfrom Sep 22, 2025
Merged
Conversation
aws-cdk-automation
previously requested changes
Sep 17, 2025
Contributor
Author
|
@aws-cdk-automation Clarification Request How would I go about writing an integration test for functionality in the |
✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.
mrgrain
approved these changes
Sep 22, 2025
Contributor
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Contributor
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Contributor
|
Comments on closed issues and PRs are hard for our team to see. |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
excludepattern of['*', '!*.html', '!*/'], theindex.htmlin the root and both HTML files from theappfolder should be included - theappfolder shouldn't be excluded, due to the!*/pattern. Right now, only theindex.htmlfile in the root folder is included.Description of changes
Similar to #22002, I've updated the
completelyIgnoreslogic 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
fingerprintto check if we're ignoring directories or files, and callcompletelyIgnoresorignoresaccordingly.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