Stop .gitignore walk at git worktree boundary#1860
Merged
Conversation
In a git worktree the `.git` entry is a file containing a `gitdir:` pointer rather than a directory, so `IgnoreFile.FindIgnorePaths` walked past the worktree root and pulled in the parent repo's `.gitignore`. When the worktree lives at a path the parent excludes, every file in the worktree is reported as ignored. Treat `.git` as a boundary when it exists as a file as well as a directory. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.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
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.
Issue
csharpier was not formatting any files, in a worktree under a .gitignored folder path
Description
IgnoreFile.FindIgnorePathswalks up from the target directory collecting.gitignorefiles and stops when it encounters a.gitdirectory. In a git worktree,.gitis a file containing agitdir:pointer rather than a directory, so the walk continued past the worktree root.When the worktree lives at a path the parent repo's
.gitignoreexcludes (e.g. tools that create worktrees inside an ignored folder), every file in the worktree is matched by the parent ignore rule anddotnet csharpier format .reportsFormatted 0 files.This change also stops the walk when
.gitexists as a file, matching git's own treatment of the worktree as a separate working tree. Added a regression test that mirrors the existingGitignore_Outside_Git_Is_Not_Usedbut with.gitas a file.Related Issue
Follow-up to #1627 / #1649, which introduced the
.gitdirectory boundary but did not cover worktrees.Checklist
varthis.