fix: handle .bare/worktrees/ layout in GetWorktreeID#669
Open
mvanhorn wants to merge 1 commit intoentireio:mainfrom
Open
fix: handle .bare/worktrees/ layout in GetWorktreeID#669mvanhorn wants to merge 1 commit intoentireio:mainfrom
mvanhorn wants to merge 1 commit intoentireio:mainfrom
Conversation
GetWorktreeID only checked for .git/worktrees/ marker when extracting the worktree identifier from gitdir paths. Bare repo + worktree layouts use .bare/worktrees/<name> instead, causing "unexpected gitdir format" errors. Check both markers to support both layouts. Fixes entireio#431 Co-Authored-By: Claude Opus 4.6 <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.
Summary
Fixes #431
GetWorktreeIDnow checks both.git/worktrees/and.bare/worktrees/markers when extracting the worktree ID from a gitdir path.bare/instead of.git/Changes
cmd/entire/cli/paths/worktree.go- Added.bare/worktrees/as a fallback marker inGetWorktreeIDcmd/entire/cli/paths/worktree_test.go- Added test cases for bare repo worktree layoutTest plan
.bare/worktrees/pathsgofmtandgo vetcleanThis contribution was developed with AI assistance (Claude Code).