fix(sync): don't treat branches with no commits as merged#80
Merged
Conversation
Branches with no unique commits point to the same commit as main, so IsAncestor() trivially returns true — falsely detecting them as merged and switching to main. Fix by adding a reverse ancestry check: if both directions are true, the commits are identical (new branch, not merged). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… case Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Owner
Author
|
🎉 This PR is included in version 1.22.2 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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
stack syncfalsely detecting branches with no commits as "merged" and switching to mainIsAncestor(branch, origin/main)which trivially returns true for branches pointing to the same commit as main🤖 Generated with Claude Code