Fix docker-generate in git worktrees#1387
Merged
Merged
Conversation
Mount the resolved git common directory into the container and set GIT_DIR to point to the worktree-specific git directory within it. This allows git commands to work correctly inside the container when running from a worktree, where .git is a file (not a directory) that references the worktree's git directory outside the CURDIR mount. The fix resolves relative paths like ../.. in the git 'commondir' file, making it work for all cases: normal clones, submodules, and worktrees. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1387 +/- ##
==========================================
+ Coverage 43.74% 44.63% +0.89%
==========================================
Files 312 311 -1
Lines 33911 28681 -5230
==========================================
- Hits 14834 12803 -2031
+ Misses 18120 15103 -3017
+ Partials 957 775 -182
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
mmat11
approved these changes
Mar 2, 2026
MrAlias
approved these changes
Mar 2, 2026
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
4 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.
Summary
Fixes
make docker-generatefailing withfatal: not a git repositorywhen run from a git worktree. The root cause is that.gitis a file (not a directory) in worktrees, pointing to the real git directory outside the container mount.The fix mounts the resolved git common directory into the container and sets
GIT_DIRto point to the worktree-specific git directory within it. This allows git commands to work correctly regardless of whether the code is run from a normal clone, a submodule, or a worktree.Verification
make docker-generatenow runs withoutfatal:errors in worktreesgit describe,git rev-parse) execute correctly inside the containerChecklist