system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-05 23:29:58 +00:00
Code Issues Projects Releases Wiki Activity

CI: Add a check to report git merge commit

Browse Source
This commit is contained in:
Lucas CHOLLET 2022-11-19 16:53:54 +01:00 committed by Linus Groh
parent f93c7fbb5e
commit 839c1a574d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/lintcommits.yml vendored
View File

@ -28,6 +28,10 @@ jobs:
pattern: /^.{0,72}(?:\r?\n(?:(.{0,72})|(.*?([a-z]+:\/\/)?(([a-zA-Z0-9_]|-)+\.)+[a-z]{2,}(:\d+)?([a-zA-Z_0-9@:%\+.~\?&/=]|-)+).*?))*$/,
error: "Commit message lines are too long (maximum allowed is 72 characters, except for URLs)",
},
{
pattern: /^Merge branch/,
error: "Commit is a git merge commit, use the rebase command instead",
},
{
pattern: /^\S.*?\S: .+/,
error: "Missing category in commit title (if this is a fix up of a previous commit, it should be squashed)",

5
Meta/lint-commit.sh
View File

@ -34,6 +34,11 @@ while read -r line; do
error "Empty line between commit title and body is missing"
fi
merge_commit_pattern="^Merge branch"
if [[ $line_number -eq 1 ]] && (echo "$line" | grep -E -q "$merge_commit_pattern"); then
error "Commit is a git merge commit, use the rebase command instead"
fi
category_pattern='^(Revert "|\S+: )'
if [[ $line_number -eq 1 ]] && (echo "$line" | grep -E -v -q "$category_pattern"); then
error "Missing category in commit title (if this is a fix up of a previous commit, it should be squashed)"