gitignore: fix prefix handling when chaining .gitignore in sub directory #3131
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
…erns With the current implementation, the file3 pattern is set to the prefix "foo/foo/bar". I don't know if (unrooted) "baz" prefixed with "foo/foo/bar" should match "foo/bar/baz", but apparently it is. Anyway, that wouldn't be the case in practice because adjacent .gitignore files shouldn't be loaded.
The prefix is relative to the root, not to the parent .gitignore file. Fixes jj-vcs#3126
This partially reverts changes in a9f489c "Switch to ignore crate for gitignore handling." Since child ignore object no longer needs to access the root to resolve the prefix path, it's simpler to store a matcher per node.
yuja
force-pushed
the
push-wxxxqnsulyun
branch
from
de1c462 to
ca29791
Compare
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.
#3126
Checklist
If applicable:
CHANGELOG.md