Skip to content

common/scripts/lint-commits: fail on merge and fixup commits #58779

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
classabbyamp merged 1 commit into from
Feb 3, 2026
Merged

common/scripts/lint-commits: fail on merge and fixup commits #58779

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
2 changes: 2 additions & 0 deletions common/scripts/lint-commits
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ do
!subject {
if (length > 50) { print "::warning title=Commit Lint::" C ": subject is a bit long" }
if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print "::error title=Commit Lint::" C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
if ($0 ~ "^fixup! ") { print "::error title=Commit Lint::" C ": fixup commit included, please squash commits"; exit 1 }
Copy link
Contributor

@Bnyro Bnyro Feb 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are there lots of examples where people pushed fixup! commits?

I usually only see something like
Commit A: New package: abc-123
Commit B: Fix changelog and cross-build
Commit C: Update srcpkgs/template/abc
Commit D: Merge master into ...

So it might also make sense to look for ^[Ff]ix and ^Update?

Copy link
Member Author

@classabbyamp classabbyamp Feb 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if someone uses git commit --fixup (I do a lot) it adds thosefixup! commits.

we can add other regexes too

Copy link
Contributor

@Bnyro Bnyro Feb 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know git has something inbuilt for this.

Good to know, thanks for the explanation :)

Copy link
Member Author

@classabbyamp classabbyamp Feb 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the other cases you mentioned should be caught by line 51

if ($0 ~ "^Merge ") { print "::error title=Commit Lint::" C ": merge commit included, please rebase and remove merge commits"; exit 1 }
# Below check is too noisy?
# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
# print "::warning title=Commit Lint::" C ": not new package/update/removal?"
Expand Down