git colocation: support child workspaces - #9982
Open
calebdw wants to merge 1 commit into
Open
Conversation
`jj git colocation status` now correctly identifies child workspaces backed by Git worktrees (gitlink files) as colocated and includes the workspace name in its output. `jj git colocation enable` and `disable` now work on child workspaces. For child workspaces, `enable` creates a Git worktree and `disable` removes it, allowing colocation to be toggled after workspace creation. The `is_colocated_git_workspace` check now recognizes `.git` files (gitlinks) as indicating a colocated git worktree.
calebdw
force-pushed
the
calebdw/push-trvorlkwymyk
branch
from
August 13, 2026 17:39
a786e6a to
212b57c
Compare
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.
jj git colocation statusnow correctly identifies child workspaces backed by Git worktrees (gitlink files) as colocated and includes the workspace name in its output.jj git colocation enableanddisablenow work on child workspaces. For child workspaces,enablecreates a Git worktree anddisableremoves it, allowing colocation to be toggled after workspace creation.The
is_colocated_git_workspacecheck now recognizes.gitfiles (gitlinks) as indicating a colocated git worktree.Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)how it works, how it's organized), including any code drafted by an LLM.
an eye towards deleting anything that is irrelevant, clarifying anything
that is confusing, and adding details that are relevant. This includes,
for example, commit descriptions, PR descriptions, and code comments.