StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(ci): don't use git --no-merges for git commit message checking

Browse Source 
When doing a short clone, like travis does, git can't tell if the
oldest commit is a merge of not. Just allow either commit message
format for all commits, and rely on reviewers and common sense to not
name normal commits "Merge.*"

Fix #6051
This commit is contained in:
Anthony Bilinski 2020-04-13 00:51:48 -07:00
parent c13ede85df
commit 40989e54d8
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
verify-commit-messages.sh
View File

@ -36,11 +36,10 @@ ARG="$1"
echo "" # ← formatting echo "" # ← formatting
grep_for_invalid() { grep_for_invalid() {
# differentiate what is allowed for commit messages and merge messages # we can't rely on differentiating merge and normal commits since short clones that travis does may not be able
git log --no-merges --format=format:'%s' "$ARG" \ # to tell if the oldest commit is a merge commit or not
| grep -v -E '^(feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.{,12}\))?:.{1,68}$' \ git log --format=format:'%s' "$ARG" \
|| git log --merges --format=format:'%s' "$ARG" \ | grep -v -E '^((feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.{,12}\))?:.{1,68})|(Merge .{1,70})$'
| grep -v -E '^Merge .{1,70}$'
} }
# Conform, /OR ELSE/. # Conform, /OR ELSE/.