Skip to content

git: Fix a bug where BranchDiff shows incorrect diffs#46433

Merged
Anthony-Eid merged 1 commit intomainfrom
fix-branch-diff-not-using-remote-default
Jan 9, 2026
Merged

git: Fix a bug where BranchDiff shows incorrect diffs#46433
Anthony-Eid merged 1 commit intomainfrom
fix-branch-diff-not-using-remote-default

Conversation

@Anthony-Eid
Copy link
Contributor

@Anthony-Eid Anthony-Eid commented Jan 9, 2026

This happens when a user's default branch has different remote and local versions on their system. Because we would get a diff using just a branch name without including it's remote name as well

This is a better default because it's far less confusing from a user's perspective to debug what's going on.

Release Notes:

  • git: Fix BranchDiff showing incorrect diffs when default local branch is out of sync with the remote default branch

This happened when a user's default branch had different remote and
local versions on their system. Because we would get a diff using just a
branch name without using it's remote name as well

I'm not sure if we want this behavior, but I'm openning this PR because
I run into this when openning the BranchDiff and it was confusing to
figure out what was going on from a user's perspective.
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 9, 2026
@Anthony-Eid Anthony-Eid merged commit 5f92b31 into main Jan 9, 2026
25 checks passed
@Anthony-Eid Anthony-Eid deleted the fix-branch-diff-not-using-remote-default branch January 9, 2026 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants