fix(app): improve workspace display for JJ colocated repos and git worktrees#17105
Closed
sjawhar wants to merge 1 commit intoanomalyco:devfrom
Closed
fix(app): improve workspace display for JJ colocated repos and git worktrees#17105sjawhar wants to merge 1 commit intoanomalyco:devfrom
sjawhar wants to merge 1 commit intoanomalyco:devfrom
Conversation
github-actions
bot
added
needs:compliance
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
This was referenced Mar 12, 2026
sjawhar
force-pushed
the
feat/workspace-jj
branch
3 times, most recently
from
3a6e57a to
3c3eb39
Compare
sjawhar
force-pushed
the
feat/workspace-jj
branch
2 times, most recently
from
07f6836 to
2d790b0
Compare
sjawhar
force-pushed
the
feat/workspace-jj
branch
from
2d790b0 to
83cdf89
Compare
|
Please continue with this and have a functional e2e |
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.
Issue for this PR
Closes #16474
Related: #5008
Type of change
What does this PR do?
Fixes workspace/worktree display in the sidebar for JJ colocated repos and git worktrees that report detached HEAD.
Problem: In JJ colocated repos,
git rev-parse --abbrev-ref HEADreturnsHEAD(detached). The sidebar displayed this literal string instead of a useful name. Additionally, navigating to a sandbox directory didn't auto-expand the workspace view.Changes:
HEADbranch names in sidebar labels — fall through to the directory name instead of displaying "HEAD".Why this works: JJ colocated repos use git's worktree mechanism internally — each workspace has a
.gitfile pointing to the main repo's.git/worktrees/<name>. Git commands in these directories reportHEADas the branch. The fix treatsHEADas equivalent to "no branch" and falls through to directory-based naming, which is the correct behavior for JJ workspaces.How did you verify your code works?
jj workspace listshows default, voice, etc.).bun typecheckpasses.Screenshots / recordings
N/A — changes are to sidebar label logic and navigation, no visual design changes.
Checklist