Skip to content

lintdiff: use git diff --merge-base in one step #5633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pietern merged 1 commit into from
Jun 17, 2026
Merged

lintdiff: use git diff --merge-base in one step #5633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions tools/lintdiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@ def main():
if gitroot:
os.chdir(gitroot[0])

# Resolve the merge base between the ref and HEAD so that we only lint
# files changed on this branch, not files that changed on the ref since
# the branch point.
merge_base = parse_lines(["git", "merge-base", args.ref, "HEAD"])
base = merge_base[0] if merge_base else args.ref

changed = parse_lines(["git", "diff", "--name-only", base, "--", "."])
# Diff the merge base against the working tree so we only lint files changed
# on this branch, not files that advanced on the ref since the branch point.
# Unlike testmask's three-dot "ref...HEAD" form (tools/testmask/git.go), this
# includes the dirty tree's uncommitted changes, which is the point of --fix.
changed = parse_lines(["git", "diff", "--name-only", "--merge-base", args.ref, "--", "."])

cmd = args.args[:]

Expand Down
Loading