fix for inflated diff counts when base branch has been updated since stack init#39
Merged
Conversation
Contributor
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
skarim
force-pushed
the
skarim/fix-view-diff
branch
from
9432aca to
07c2434
Compare
skarim
added a commit
that referenced
this pull request
Apr 20, 2026
…stack init (#39) * fix for inflated diff counts when base branch has been updated since stack init
ryanclark
added a commit
to ryanclark/gh-stack
that referenced
this pull request
Jun 19, 2026
Ports the still-applicable upstream changes since the fork point, adapted to this fork's standard-GitHub-API architecture (no private stack backend; stack deps tracked via "Requires #N"). Each change was test-driven. Bug fixes: - github#56 guard GraphQL PR-number conversion against int32 overflow - github#41 skip merged+deleted branches when rebasing (rev-parse error) - github#42 same fix on the sync path - github#43 --onto rebase for merged branches: backfill refs, pre-seed onto state, stale-base fallback via merge-base - github#39 always anchor branch diffs on the merge-base (inflated diff counts) - github#95 sync now cascades when the stack is stale even if trunk is current; rebase skips queued branches (IsSkipped) - github#80 view --json resolves directly with typed exit codes (no prompt) - github#49 (Part A) ignore stale merged/closed PRs for reused branch names (the backend ListStacks path is intentionally omitted) Features (standard API only): - github#108 trunk command - github#51 switch command - github#74 unstack -> active - github#101 add adopts existing branch - github#40 fast-forward branches behind their remote - github#76 draft PRs by default + --open (adds MarkPRReadyForReview) - github#77 seed PR body from repo template (keeps "Requires #N") - github#94 sync --prune merged branches Infra / cleanup: - github#103/github#110 bump github.com/cli/cli/v2 to v2.93.0 (go get + tidy) - github#89 remove placeholder `merge` command + docs - fix stale `unstack [branch]` docs Note: this commit is layered on in-progress local work (go-git ops, PR/commit caching, discover command) that shares the same files, so the two are committed together. Full suite green: build, vet, go test ./...
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.