fix: adopt --remote uses stale parent when parent PR is merged/closed#691
Open
simsinght wants to merge 1 commit intofix/adopt-remote-batch-orderingfrom
Open
fix: adopt --remote uses stale parent when parent PR is merged/closed#691simsinght wants to merge 1 commit intofix/adopt-remote-batch-orderingfrom
simsinght wants to merge 1 commit intofix/adopt-remote-batch-orderingfrom
Conversation
When a parent PR was merged or closed, initAdoption walked up the chain to find the nearest open ancestor. However, the AdoptingBranch was constructed before this walk, so it kept the original (closed) parent instead of the resolved one. Move AdoptingBranch construction to after the parent resolution loop.
Contributor
🔃 FlexReview StatusCommon Owner:
Review SLO: |
3 tasks
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request refactors the branch adoption logic in cmd/av/adopt.go by moving the instantiation of the AdoptingBranch struct to occur after the loop that resolves the parent branch. This ensures that the branch metadata correctly reflects the updated parent if the original parent was merged or closed. I have no feedback to provide.
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.
Stacked on #679
Summary
adopt --remoteencountered a merged/closed parent PR, it walked up the chain to find the nearest open ancestor — butAdoptingBranchwas constructed before this walk, so it kept the stale parentAdoptingBranchconstruction to after the parent resolution loop