fix: support bare repo worktrees in GitWorktree widget#138
Open
gn0rt0n wants to merge 1 commit intosirmalloc:mainfrom
Open
fix: support bare repo worktrees in GitWorktree widget#138gn0rt0n wants to merge 1 commit intosirmalloc:mainfrom
gn0rt0n wants to merge 1 commit intosirmalloc:mainfrom
Conversation
The GitWorktree widget now correctly detects worktrees from bare repositories. Previously, it only checked for `.git/worktrees/` in the path, but bare repos store worktree metadata at `<bare-repo>/worktrees/<name>` without the `.git` prefix. This adds an additional check for `/worktrees/` pattern when the `.git/worktrees/` pattern isn't found. Fixes detection for setups like: - Bare repo at: /path/to/repo (contains objects/, refs/, HEAD, etc.) - Worktree at: /path/to/repo/trees/feature-x - Git dir: /path/to/repo/worktrees/feature-x
zoonderkins
added a commit
to zoonderkins/ccstatusline
that referenced
this pull request
Jan 21, 2026
Merged PRs: - sirmalloc#138: fix: support bare repo worktrees in GitWorktree widget - sirmalloc#135: feat: add git-indicators widget - sirmalloc#132: fix: Windows terminal width detection - sirmalloc#131: feat: Task Timer widget - sirmalloc#123: feat: Add backups for settings.json - sirmalloc#121: feat: Add configurable context warning alerts - sirmalloc#120: feat: Add Mercurial support - sirmalloc#119: feat: Add Git Root Dir widget - sirmalloc#58: feat: Add support for local/project settings Fixes Issues: - sirmalloc#117: Windows tput cols creates null file - sirmalloc#122: claude's settings.json deleted/lost - sirmalloc#112: Add mercurial support Additional fixes: - Resolved circular dependency in renderer.ts/widgets.ts - Fixed lint errors in multiple files
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
The GitWorktree widget now correctly detects worktrees from bare repositories.
Previously, it only checked for
.git/worktrees/in the path, but bare repos store worktree metadata at<bare-repo>/worktrees/<name>without the.gitprefix.Before: Worktrees from bare repos showed "no git" instead of the worktree name
After: Correctly displays the worktree name
Changes
/worktrees/pattern when.git/worktrees/isn't foundTest plan
Example
Bare repo setup:
Running
git rev-parse --git-dirfromtrees/feature-x/returns/path/to/repo/worktrees/feature-x, which now correctly extractsfeature-xas the worktree name.