fix: use three-dot diff for scope drift detection in /review#221
Open
roblambell wants to merge 1 commit intogarrytan:mainfrom
Open
fix: use three-dot diff for scope drift detection in /review#221roblambell wants to merge 1 commit intogarrytan:mainfrom
roblambell wants to merge 1 commit intogarrytan:mainfrom
Conversation
The scope drift step (Step 1.5) used `git diff origin/<base> --stat` (two-dot), which shows the full tree difference between the branch tip and the base ref. On rebased branches this includes commits already on the base branch, producing false-positive "scope drift" findings for changes the author did not introduce. Switch to `git diff origin/<base>...HEAD --stat` (three-dot / merge-base diff), which shows only changes introduced on the feature branch. This matches what /ship already uses for its line-count stat.
roblambell
force-pushed
the
fix/review-scope-drift-three-dot-diff
branch
from
ec379fe to
8659b6d
Compare
garrytan
added a commit
that referenced
this pull request
Mar 23, 2026
4 tasks
24601
pushed a commit
to 24601/gastack
that referenced
this pull request
Mar 29, 2026
…ction in /review
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
/reviewStep 1.5 (Scope Drift Detection) used two-dotgit diff origin/<base> --stat, which shows the full tree difference between HEAD and the base refgit diff origin/<base>...HEAD --stat(merge-base diff), which shows only changes introduced on the feature branch/shipalready uses for its line-count statHow it was found
Contributor mode filed a field report after
/reviewflagged unrelated version bumps and date changes as scope drift on a rebased feature branch. The changes came from main via rebase, not from the feature work.Test plan
bun testpasses/reviewon a rebased feature branch — scope drift step no longer flags rebased-in changes from main