fix(sync): detect branches merged by force-push to trunk - #1385
Open
AruneshDwivedi wants to merge 1 commit into
Open
fix(sync): detect branches merged by force-push to trunk#1385AruneshDwivedi wants to merge 1 commit into
AruneshDwivedi wants to merge 1 commit into
Conversation
When a stack is merged by force-pushing the tip directly to trunk instead of through a change request, the forge API has no record of the merge. This leaves tracked branches marked as live even though their commits are now reachable from trunk. Signed-off-by: Arunesh Dwivedi <arunesh.devops@gmail.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.
When a stack is merged by force-pushing the tip directly to trunk instead of through a change request, the forge API has no record of the merge. This leaves tracked branches marked as live even though their commits are now reachable from trunk.
The fix adds a local-ancestor check after findForgeFinishedBranches returns. Branches whose head is reachable from the updated trunk hash are now also included in the deletion candidates, matching the behavior of the unsupported-forge code path.
Closes #1248.