fix(native): resolve missing Git worktree refs - #6364
Merged
Conversation
tlgimenes
force-pushed
the
codex/fix-native-git-ref-resolution
branch
from
August 20, 2026 20:03
1ef1b58 to
880f985
Compare
tlgimenes
enabled auto-merge (squash)
August 20, 2026 20:13
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
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
Root cause
The missing-branch fallback depended on two human-readable errors from git worktree add. The reporter Git version emitted Not a valid object name instead, so Studio returned immediately and never tried origin/HEAD even though clone and fetch had succeeded.
Testing
Summary by cubic
Resolve Git worktree start points structurally and pin them to immutable commit OIDs. This restores missing-branch fallback across Git versions, prevents orphan branches on nonempty remotes, and makes worktree creation robust to concurrent fetch/prune.
refs/remotes/origin/*viarev-parse^{commit}; confirm absence withshow-ref; repairorigin/HEADusingremote set-head -a; allow no start point only whenrev-list --max-count=1 --remotes=originis empty. Always pass the resolved OID togit worktree add.branch.<name>.{remote,merge}.SandboxManagerand tweak the completion trace.origin/HEAD; missing/danglingorigin/HEADrepair; sibling-held branch fallback reusing the same OID; nonempty-remote-without-default failing early; cancellation classification; orphan behavior guarded byrev-list.log_storewithas_chunks::<2>(); remove the implementation plan doc.Written for commit 880f985. Summary will update on new commits.