fix: resolve worktree base branch from current HEAD, not default_branch - #32
Merged
Merged
Conversation
resolveBaseBranch() was prioritizing the workspace config's default_branch over the repo's actual current branch. This caused worktrees to be created from 'develop' instead of the developer's feature branch, missing any commits made on the feature branch (including task files). Swap priority: detect current branch first, fall back to default_branch only when HEAD is detached or undetectable.
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.
resolveBaseBranch()was prioritizing the workspace config'sdefault_branchover the repo's actual current branch. This caused worktrees to branch fromdevelopinstead of the developer's feature branch, so task files committed on the feature branch were missing from worktrees.Root cause
Priority order was: default_branch → current branch → batch base branch. Should be: current branch → default_branch → batch base branch.
Fix
Swap steps 1 and 2 in
resolveBaseBranch()so the repo's current HEAD is detected first.Testing
398/398 tests passing.