From 7588e217af33eb5e8085375e50747b3f34ba3ffc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 31 Jan 2026 09:51:26 -0500 Subject: [PATCH] common/scripts/lint-commits: fail on merge and fixup commits --- common/scripts/lint-commits | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits index 56f16ff194b..1e5f8e55e4c 100755 --- a/common/scripts/lint-commits +++ b/common/scripts/lint-commits @@ -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 } + 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?"