summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorLucas CHOLLET <lucas.chollet@free.fr>2022-12-10 15:15:23 +0100
committerLinus Groh <mail@linusgroh.de>2022-12-10 16:23:09 +0000
commitb3478b3613273a93af9ee75f9730cb16c4aec5ee (patch)
tree1bae53b7f66cb58a34febcefa616fabb86e3b3df /.github
parent54c12b76ed04e3aa6a04dc7e29faa202b8e52bae (diff)
downloadserenity-b3478b3613273a93af9ee75f9730cb16c4aec5ee.zip
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.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/lintcommits.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/lintcommits.yml b/.github/workflows/lintcommits.yml
index 14d65ad89e..9a04f3636f 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",
},
{