Jujutsu - #2185
Draft
himynameisjonas wants to merge 5 commits into
Draft
Conversation
In a colocated jj repo git HEAD is pinned detached at the working-copy parent, so bb rendered every jj workspace as "detached <sha>". The detached checkout variant now carries an optional jj object with the bookmark pointing at HEAD, resolved with plain git (for-each-ref --points-at HEAD), so the daemon needs no jj binary. Bumps HOST_DAEMON_PROTOCOL_VERSION to 147.
Renders the bookmark from the checkout's jj field in the metadata row (row label Bookmark), the compose branch picker (Current: <bookmark> (jj)), and the CLI environment status output. The compose branch mutation blocker now says branch switching is managed by jj instead of a bare Detached label.
A git commit in a jj main workspace imports without conflict but leaves the previous working-copy change as a stray anonymous head in jj log and moves no bookmark. The daemon now throws a typed jj_workspace error and the server maps it to 409. Managed worktrees of a jj repo have no .jj directory and commit as before. Bumps HOST_DAEMON_PROTOCOL_VERSION to 148.
Pins the behavior the jj support relies on staying free: managed worktrees provision from a colocated jj source with git worktree add and their commits import as bookmarks, readDefaultBranch resolves in a jj git clone --colocate, bookmark moves change the shared refs fingerprint, and the exported bookmark ref path classifies as a shared-git-refs change in the watcher.
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.
No description provided.