Fix handling git worktrees - #7540
Open
nilsvu wants to merge 5 commits into
Open
Conversation
In a worktree .git is a file and hooks are shared, so ask git for the hooks dir and drop hardcoded source paths from the hook. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
.git is a file in worktrees, so the git branch was never taken. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Git-ignored files like CMakeUserPresets.json don't carry over, so a post-checkout hook symlinks them from the main worktree. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
In a worktree .git is a file, and in the main checkout AGENTS.local.md is a real file. Both lack a license and fail the check. Co-Authored-By: Claude Fable 5.1 <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
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.
Proposed changes
Fix some problems with git worktrees:
Upgrade instructions
Code review checklist
make docto generate the documentation locally intoBUILD_DIR/docs/html.Then open
index.html.code review guide.
bugfixornew featureif appropriate."Co-Authored-By: " as the last line of the
commit, e.g. "Co-Authored-By: Claude Sonnet 4.6 noreply@anthropic.com",
"Co-Authored-by: Codex noreply@openai.com", or
"Co-Authored-By: GitHub Copilot CLI noreply@microsoft.com".
Further comments