fix(ignore): respect .gitignore with multiple search paths#3417
Open
leno23 wants to merge 1 commit into
Open
Conversation
When multiple search paths are provided, reuse of compiled parent matchers keyed only by parent directory could apply stale absolute_base values from an earlier root. Include absolute_base in the cache key and add a regression test. Fixes BurntSushi#3376 Co-authored-by: Cursor <cursoragent@cursor.com>
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
1 participant
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.
Summary
When ripgrep is given multiple search paths (e.g.
rg pattern src/ tests/), compiled parent-directory ignore matchers were cached keyed only by the parent directory path. Reusing those entries for later search roots could leave a staleabsolute_base, causing.gitignorerules to be applied incorrectly.This change keys the cache by
(parent_path, absolute_base_path)and adds a regression test reproducing the order-dependent behavior from the issue.Fixes #3376
Related: #3320
Test plan
cargo test -p ignore multi_root_gitignore_absolute_basecargo test -p ignore