fix: create worktrees from empty git repos#32367
Open
wgu9 wants to merge 1 commit into
Open
Conversation
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.
Issue for this PR
Fixes #20910
Related: #32341
Type of change
What does this PR do?
Creating an opencode worktree from a git repo with no commits currently fails because
git worktree addinfers--orphan, while opencode also passes--no-checkout. Git rejects that combination.This PR keeps the existing
--no-checkoutpath for normal repositories with a validHEAD, but omits it when the source repository has an unbornHEAD. That lets Git create the orphan worktree branch for empty repos. It also treats a missing branch during cleanup as already clean, which can happen after removing an unborn worktree branch.The covered cases are:
How did you verify your code works?
bun test test/project/worktree.test.tsbun test test/project/worktree-remove.test.tsbunx oxlint packages/opencode/src/worktree/index.ts packages/opencode/test/project/worktree.test.tsgit diff --checkScreenshots / recordings
Not applicable. This is git worktree lifecycle behavior covered by regression tests.
Checklist