fix(worktree): detect default branch dynamically#28
Merged
Conversation
`detect_default_branch` checked `init.defaultBranch` first, but that config governs what `git init` names new repos — not the default branch of the current one. A global `init.defaultBranch=master` therefore hijacked repos whose actual default is `main`/`alacritree`/etc., and worktree creation failed with "base branch `master` not found locally or on origin". Now the cascade is: `refs/remotes/origin/HEAD` → common local names (main/master/trunk/develop) → `init.defaultBranch` only if it names a real local branch. Worktree creation adds a runtime fallback that queries origin via `git ls-remote --symref origin HEAD` when the cached hint doesn't resolve, so a stale or missing local hint no longer blocks creation. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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.
Summary
Test plan
🤖 Generated with Claude Code