fix(worktree): handle branch checkout when branch doesn't exist on remote #124
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
…mote Fix branch checkout failure when creating worktrees for branches that don't exist on the remote repository. Previously, the code would attempt to create a branch from origin/branch without checking if that remote branch exists, resulting in errors like: fatal: 'origin/deploy-v0-0-67' is not a commit and a branch 'deploy-v0-0-67' cannot be created from it Changes: - Modified CheckoutBranch to check if origin/branch exists before attempting to create from it - Added fallback logic: fetch from origin, then check again - Final fallback: create branch from HEAD if remote branch doesn't exist - Added integration tests for various checkout scenarios - Added E2E tests to reproduce and verify fix for the original bug scenario Fixes the issue where worktree creation fails for branches like deploy-v0-0-67 that don't exist on the remote but need to be created locally.
Extract helper functions to reduce complexity from 14 to below 10: - tryCheckoutBranch: attempts direct branch checkout - tryCheckoutFromOrigin: attempts checkout from origin/branch - createBranchFromHead: creates branch from HEAD This addresses the golangci-lint cyclop linter requirement.
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.
Problem
When creating a worktree for a branch that doesn't exist on the remote repository, the checkout process would fail with an error like:
This occurred because the code attempted to create a branch from
origin/branchwithout first checking if that remote branch exists.Solution
Modified
CheckoutBranchinpkg/git/checkout_branch.goto:origin/branchexists on remote before attempting to create from itTesting
Changes
pkg/git/checkout_branch.go: Enhanced checkout logic with proper fallback handlingpkg/git/checkout_branch_test.go: Added integration teststest/worktree_create_test.go: Added E2E tests for repo and workspace modesFixes the issue where worktree creation fails for branches that don't exist on the remote but need to be created locally.