From 6640184f15aa0b8e9415a636d9db3be837cd772b Mon Sep 17 00:00:00 2001 From: Alex Kuleshov Date: Sun, 5 Apr 2026 14:10:52 -0400 Subject: [PATCH] ci: skip merge commits in conventional commit linter When a PR branch has back-merges from main, the resulting "Merge branch 'main' into ..." subjects are not conventional commit messages and fail lint-commits. Pass --no-merges to git log so merge commits are skipped by read_commit_range, which is used by both the conventional commit linter and release note generation (where merge subjects are never useful either). Co-Authored-By: Claude Opus 4.6 --- scripts/plugins_repo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/plugins_repo.py b/scripts/plugins_repo.py index 4979341..959a09e 100644 --- a/scripts/plugins_repo.py +++ b/scripts/plugins_repo.py @@ -392,7 +392,7 @@ def parse_conventional_commit(sha: str, subject: str, body: str) -> Conventional def read_commit_range(range_spec: str, *paths: str) -> list[ConventionalCommit]: - command = ["git", "log", "--format=%H%x1f%s%x1f%b%x1e", range_spec] + command = ["git", "log", "--no-merges", "--format=%H%x1f%s%x1f%b%x1e", range_spec] if paths: command.extend(["--", *paths]) log_output = run_command(*command)