Fix parent ignore matching for multiple explicit roots#3321
Open
markusylisiurunen wants to merge 1 commit intoBurntSushi:masterfrom
Open
Fix parent ignore matching for multiple explicit roots#3321markusylisiurunen wants to merge 1 commit intoBurntSushi:masterfrom
markusylisiurunen wants to merge 1 commit intoBurntSushi:masterfrom
Conversation
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 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.
Fixes #3320.
This fixes an order-dependent bug in parent ignore matching when ripgrep is given multiple explicit search roots.
The root cause was in
Ignore::add_parents. Absolute-parent matchers were cached only by ancestor directory path, but they also carried root-specific state inabsolute_base. When a later explicit root reused a cached matcher built for an earlier root, parent ignore rules could be evaluated relative to the wrong root, which made.rgignore/ parent ignore behavior depend on the order of the explicit roots.The fix keeps the existing per-directory cache, but stops reusing the cached matcher node directly across roots. Instead, on a cache hit, it rebinds the current parent chain and
absolute_basewhile reusing the compiled matcher data. The cache entry is then refreshed to keep reuse working across successive roots.Tests added:
crates/ignore/src/dir.rscovering reuse across multiple explicit rootscrates/ignore/src/walk.rscovering both root ordersValidation:
cargo test -p ignore