Fix fork PR matching and always show worktree trailing info#229
Merged
Conversation
Fix PR matching so fork PRs (e.g. vadimi:main) no longer falsely associate with the local main branch. The fallback now checks baseRefName to distinguish whether the local branch is the PR's target or source, conservatively excluding PRs with unknown base refs. Also remove the isBusy guard in WorktreeRow's TrailingView so diff stats and PR badges are always visible, even while a task is running.
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
vadimi:main) no longer falsely associate with the localmainbranch. The fallback now checksbaseRefNameto distinguish whether the local branch is the PR's target or source, conservatively excluding PRs with unknown base refs.isBusyguard inWorktreeRow'sTrailingViewso diff stats and PR badges are always visible, even while a task is running.Test plan
ignoresForkPRWhenBaseRefMatchesBranch— fork PR excluded when baseRefName matches local branchmatchesForkPRWhenBaseRefDiffersFromBranch— fork PR included when baseRefName differsskipsNilHeadRepositoryInForkFallback— nil headRepository excluded in fallbackexcludesForkPRWithNilBaseRefName— nil baseRefName conservatively excludedmapsGraphQLAliasesToBranches,prefersOpenOverMergedEvenIfOlder,fallsBackToLatestMerged) still pass