worktree: Anchor ignore rules at the repository they belong to (#62325) (cherry-pick to preview) - #62484
Merged
Merged
Conversation
Since #60772, a worktree's ignore rules are also applied to the directories above its root. Because of this, an `info/exclude` pattern naming one of those parent directories marks it as ignored, and with it the whole worktree below. Stop the walk at the repository containing the worktree root. Also skip exclude rules for paths outside the work directory they are anchored at, as `.gitignore` and global gitignore rules already do. Release Notes: - Fixed a worktree being reported as entirely ignored when its repository's `info/exclude` named one of the worktree's parent directories
cla-bot
Bot
added
the
cla-signed
zed-zippy
Bot
added
the
PR state:needs review
Member
|
@zed-industries/approved |
zed-zippy
Bot
removed
the
PR state:needs review
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
2 participants
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.
Cherry-pick of #62325 to preview
Since #60772, a worktree's ignore rules are also applied to the
directories above its root. Because of this, an
info/excludepatternnaming one of those parent directories marks it as ignored, and with it
the whole worktree below.
Stop the walk at the repository containing the worktree root.
Also skip exclude rules for paths outside the work directory they are
anchored at, as
.gitignoreand global gitignore rules already do.Release Notes:
repository's
info/excludenamed one of the worktree's parentdirectories