Skip to content

fix(vcs): prefer fresh refs over cached on branch-list reload #2986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denniskasper wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Open

fix(vcs): prefer fresh refs over cached on branch-list reload #2986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/client-runtime/src/vcsRefState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,12 @@ export function createVcsRefManager(config: VcsRefManagerConfig) {
: options?.preserveLoadedRefs && current && current.refs.length > result.refs.length
? {
...result,
refs: mergeRefs(result.refs, current.refs),
// Fresh server refs must win over previously-loaded ones for
// overlapping names; otherwise a stale `current: true` (e.g. the
// branch you were on before an external checkout) survives and
// you get two refs both badged "current". `mergeRefs` lets the
// second arg overwrite the first, so pass fresh refs last.
refs: mergeRefs(current.refs, result.refs),
nextCursor: current.nextCursor,
totalCount: Math.max(result.totalCount, current.totalCount),
}
Expand Down
Loading