From b3478b3613273a93af9ee75f9730cb16c4aec5ee Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Sat, 10 Dec 2022 15:15:23 +0100 Subject: [PATCH] CI: Correct regex to retrieve git merge commit In 839c1a57, I wrongly assumed that a matched pattern will raise an error, it's the opposite. This patch "negates" the regex to solve the issue. --- .github/workflows/lintcommits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lintcommits.yml b/.github/workflows/lintcommits.yml index 14d65ad89e2..9a04f3636fa 100644 --- a/.github/workflows/lintcommits.yml +++ b/.github/workflows/lintcommits.yml @@ -29,7 +29,7 @@ jobs: error: "Commit message lines are too long (maximum allowed is 72 characters, except for URLs)", }, { - pattern: /^Merge branch/, + pattern: /^((?!^Merge branch).)*$/, error: "Commit is a git merge commit, use the rebase command instead", }, {