fix: use remote URL for detached clone when branch doesn't exist locally #119
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
Fixed issue where worktree load command failed when loading branches from remote. The problem was that detached clones were trying to clone from local path with --branch flag, which failed when the branch only existed on the remote. Changes: - Modified createDetachedClone to check if branch exists locally - If branch exists locally, use CloneToPath (clones from local path) - If branch doesn't exist locally, clone from remote URL and checkout branch - Updated CheckoutBranch to handle remote tracking branches when branch doesn't exist locally - Updated unit test to match new implementation This fixes the issue where 'cm wt load -r <repo> <branch>' would fail with: 'fatal: Remote branch <branch> not found in upstream origin' All tests pass: lint, unit, integration, and e2e.
- Fix line length issue in checkout_branch.go (split long error message) - Reduce complexity in create.go by extracting helper functions
…chExists calls - Skip EnsureBranchExists when creating detached worktrees since createDetachedClone handles branch checking - Update TestWorktree_Create_DetachedMode to expect BranchExists to return false, matching the remote clone path behavior
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
Fixed issue where
cm wt load -r <repo> <branch>command failed when loading branches from remote.Problem
The
worktree loadcommand was failing with:This happened because detached clones were trying to clone from local path with
--branchflag, which failed when the branch only existed on the remote (not locally).Solution
createDetachedCloneto check if branch exists locallyCloneToPath(clones from local path)CheckoutBranchto handle remote tracking branches when branch doesn't exist locallyTesting
All tests pass:
Example
This now works correctly.