fix for inflated diff counts when base branch has been updated since stack init#39
Open
fix for inflated diff counts when base branch has been updated since stack init#39
Conversation
There was a problem hiding this comment.
Pull request overview
Fixes incorrect/inflated diff file counts in the stack view when the base branch has advanced since the stack was initialized by anchoring diffs to the merge-base (fork point) instead of the base branch tip.
Changes:
- Update
LoadBranchNodesto compute diff/commit ranges usinggit merge-base(base, branch)as the diff base. - Add unit tests covering diverged-base and linear-history scenarios to ensure merge-base is used.
Show a summary per file
| File | Description |
|---|---|
| internal/tui/stackview/data.go | Switches diff anchor to merge-base to avoid including unrelated base-branch changes in file stats. |
| internal/tui/stackview/data_test.go | Adds regression tests validating merge-base behavior for diverged and linear cases. |
Copilot's findings
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 2/2 changed files
- Comments generated: 1
ktravers
approved these changes
Apr 16, 2026
Lukeghenco
approved these changes
Apr 16, 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
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.
Fix inflated diff counts in
gh stack viewTUIWhen the local base branch (e.g.
main) had advanced past a branch's fork point,gh stack viewshowed inflated file counts and diff stats because the two-dot diff compared full trees instead of diffing from the fork point.Fix: Always use
git merge-baseto find the fork point for diff computation, not just for merged branches.