fix(vscode): use current remote default for diffs - #13263
Merged
Conversation
marius-kilocode
enabled auto-merge
August 20, 2026 09:27
johnnyeric
approved these changes
Aug 20, 2026
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
2 participants
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.
Kilo can use stale local
origin/HEADmetadata when calculating branch diffs. Repositories that migrated frommastertomaincan therefore show repository-scale totals even when the branch has only a small change.Resolve the remote default branch with a read-only, bounded
git ls-remote --symrefquery and cache the result. Keep local remote HEAD as the offline fallback, and use the shared resolver for new worktree defaults. Existing persisted worktree bases and explicit upstreams remain unchanged.The reported case reproduced as
+350043/-180697against staleorigin/master; the corrected comparison againstorigin/mainis+110/-96across 7 files.Includes regression coverage for migrated trunks, legitimate
masterdefaults, remote-unavailable fallback, resolver caching, and matching local diff targets.