aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2020-05-25 09:26:16 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2020-05-25 09:26:16 -0700
commitfdf34816a528740ec53ba392609f37d3e70a2f85 (patch)
tree73accdf925a03e5ed2bf88bd40646cd9caed8dcc
parent37ef57be5154e316b758332428c18ecc22240617 (diff)
downloadpandoc-fdf34816a528740ec53ba392609f37d3e70a2f85.tar.gz
CI: Don't include merge commits when checking message length.
-rw-r--r--.github/workflows/ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97d4eb889..d935ce079 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
- name: Check commit message
run: |
# Get last commit message
- git log -1 --pretty=format:"%s" | grep -c "^[^#].{78}"
+ git log -1 --pretty=format:"%s" --no-merges | grep -c "^[^#].{78}"
if [ $? -eq 0 ]; then
echo "Last commit log contains a line with more than 78 characters."
exit 1