fix: separate Sapling override from auto-detected default branch#346
Merged
tomasz-tomczyk merged 1 commit intomainfrom Apr 24, 2026
Merged
fix: separate Sapling override from auto-detected default branch#346tomasz-tomczyk merged 1 commit intomainfrom
tomasz-tomczyk merged 1 commit intomainfrom
Conversation
SaplingVCS.GetDefaultBranchOverride() was returning the auto-detected branch when no override was set, unlike GitVCS which returns empty string. This caused ChangeBaseBranch rollback to set the detected value as an explicit override, preventing future auto-detection. Add a separate overrideBranch field to track explicit overrides independently from the detected defaultBranch value. Co-Authored-By: Claude Opus 4.6 (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
overrideBranchfield toSaplingVCSto track explicit overrides independently from auto-detecteddefaultBranchGetDefaultBranchOverride()now returns empty string when no override is set, matchingGitVCSbehaviorChangeBaseBranchrollback path which would previously turn the auto-detected branch into an explicit override, preventing future auto-detectionTest plan
go build ./...— compiles cleango vet ./...— no issuesTestSaplingVCS_DefaultBranchOverride— passes🤖 Generated with Claude Code