chore: back-merge v0.11.12 hotfix into develop#377
Merged
Conversation
git never updates refs/remotes/origin/HEAD on fetch/pull, so a repo whose remote default branch changed after it was cloned kept showing the stale default (e.g. "main" instead of "develop") as the Base Branch in the New Worktree sheet. Wire the existing GitService.updateRemoteHead() (git remote set-head origin --auto) into the two flows that read the default branch: - addRepository: sync origin/HEAD up front when a repo is added - NewWorktreeSheet.loadData: refresh origin/HEAD before reading defaultBranch, so repos whose remote default changed after they were added self-correct Extract the default-branch helpers into WorktreeSidebarViewModel+DefaultBranch .swift (mirrors the +FocusWorktrees split) to keep the type under the type_body_length limit. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fix: hotfix v0.11.12 — New Worktree base branch follows the remote default
Auto-generated appcast files for Sparkle auto-updates. Co-Authored-By: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
chore: Update appcast for v0.11.12
…1.12 # Conflicts: # CHANGELOG.md
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.
Merges
main(hotfix v0.11.12, its CHANGELOG entry, and the v0.11.12 appcast update) intodevelopto keep branch histories in sync.This also reconciles the long-standing strand:
mainhad been stuck at v0.11.7 while v0.11.8–v0.11.11 lived only on develop's line. As of the v0.11.12 hotfix,mainis now at v0.11.12, and this back-merge brings its merge history into develop's ancestry.Conflict resolution
CHANGELOG.md: kept develop's[Unreleased]section (the unreleased MCP/CLI batch) and inserted main's released## [0.11.12]section above## [0.11.11].appcast.xml: merged cleanly (no conflict).Merge with a real merge commit — do not squash (squashing re-introduces divergence between main and develop).
🤖 Generated with Claude Code