Improve diff stats to compare against default branch and handle squash merges #67
Merged
amandal0903 merged 3 commits intomainfrom Apr 5, 2026
Merged
Improve diff stats to compare against default branch and handle squash merges #67amandal0903 merged 3 commits intomainfrom
amandal0903 merged 3 commits intomainfrom
Conversation
added 3 commits
April 5, 2026 19:44
…h merges Rework getDiffStats to diff against origin/<default-branch> instead of using merge-base from the worktree branch. Uses a scoped two-dot diff so squash-merged branches correctly show empty stats. Falls back to local working-tree changes when there are no commits ahead. Extracts parseNumstat helper with unit tests.
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
1 participant
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.
Summary
using merge-base, so squash-merged branches correctly show empty stats
changes main picked up after merge
commits ahead of the base