fix: use commondir to resolve git directory in worktrees#13045
Open
fix: use commondir to resolve git directory in worktrees#13045
Conversation
This PR fixes git revision detection in worktrees where the worktree's gitdir path passes through another git repository. The previous code used `_git_find_closest_git_dir` which walks up the filesystem looking for a `.git` entry, but this finds the wrong repository when the worktree gitdir is stored inside another git repo (e.g. when the project is a git submodule of a parent repo that also uses git). Instead, read the `commondir` file that git places in every worktree's gitdir, which directly points to the shared git object directory. Fall back to the old filesystem walk if `commondir` doesn't exist. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
kim-em
changed the title
github-actions
bot
added
the
toolchain-available
|
Mathlib CI status (docs):
|
Collaborator
|
Reference manual CI status:
|
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.
This PR fixes git revision detection in worktrees where the worktree's gitdir path passes through another git repository.
The vendored
GetGitRevisionDescription.cmakemodule detects worktrees and then calls_git_find_closest_git_dirto find the shared git directory by walking up the filesystem looking for a.gitentry. This fails when the worktree's gitdir is stored inside another git repository (e.g. when the project is a git submodule whose objects live at~/.git/modules/...and~is itself a git repo) — the walk finds the wrong.git.The fix reads the
commondirfile that git places in every worktree's gitdir, which directly points to the shared git object directory. Falls back to the old filesystem walk ifcommondirdoesn't exist (shouldn't happen with any modern git, but safe to keep).🤖 Prepared with Claude Code