Git - fix default worktree path when creating a worktree in a worktree #286210
+3
−1
Conversation
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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug where creating a worktree from within an existing worktree would incorrectly nest the new worktree path, creating unwanted .worktrees subdirectories. The fix ensures that when creating a worktree from another worktree, new worktrees are created as siblings in the same parent directory rather than being nested.
Key Changes:
- Modified the default worktree path calculation to check if the current repository is a worktree
- When creating from a worktree, new worktrees are now placed as siblings in the parent directory
- When creating from a regular repository, the existing behavior of creating a
.worktreessubdirectory is preserved
rzhao271
approved these changes
Jan 6, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #286083