c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

scripts/commitcheck.sh: fix false positive for signed commits

Browse Source 
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12105
This commit is contained in:
наб 2021-06-03 19:40:09 +02:00 committed by Brian Behlendorf
parent feb04e6680
commit 10bcc4da6c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/commitcheck.sh
View File

@ -7,7 +7,7 @@ REF="HEAD"
test_commit_bodylength() test_commit_bodylength()
{ {
length="72" length="72"
body=$(git log -n 1 --pretty=%b "$REF" | grep -Ev "http(s)*://" | grep -E -m 1 ".{$((length + 1))}") body=$(git log --no-show-signature -n 1 --pretty=%b "$REF" | grep -Ev "http(s)*://" | grep -E -m 1 ".{$((length + 1))}")
if [ -n "$body" ]; then if [ -n "$body" ]; then
echo "error: commit message body contains line over ${length} characters" echo "error: commit message body contains line over ${length} characters"
return 1 return 1
@ -20,7 +20,7 @@ test_commit_bodylength()
check_tagged_line() check_tagged_line()
{ {
regex='^[[:space:]]*'"$1"':[[:space:]][[:print:]]+[[:space:]]<[[:graph:]]+>$' regex='^[[:space:]]*'"$1"':[[:space:]][[:print:]]+[[:space:]]<[[:graph:]]+>$'
foundline=$(git log -n 1 "$REF" | grep -E -m 1 "$regex") foundline=$(git log --no-show-signature -n 1 "$REF" | grep -E -m 1 "$regex")
if [ -z "$foundline" ]; then if [ -z "$foundline" ]; then
echo "error: missing \"$1\"" echo "error: missing \"$1\""
return 1 return 1
@ -35,7 +35,7 @@ new_change_commit()
error=0 error=0
# subject is not longer than 72 characters # subject is not longer than 72 characters
long_subject=$(git log -n 1 --pretty=%s "$REF" | grep -E -m 1 '.{73}') long_subject=$(git log --no-show-signature -n 1 --pretty=%s "$REF" | grep -E -m 1 '.{73}')
if [ -n "$long_subject" ]; then if [ -n "$long_subject" ]; then
echo "error: commit subject over 72 characters" echo "error: commit subject over 72 characters"
error=1 error=1
@ -57,7 +57,7 @@ new_change_commit()
is_coverity_fix() is_coverity_fix()
{ {
# subject starts with Fix coverity defects means it's a coverity fix # subject starts with Fix coverity defects means it's a coverity fix
subject=$(git log -n 1 --pretty=%s "$REF" | grep -E -m 1 '^Fix coverity defects') subject=$(git log --no-show-signature -n 1 --pretty=%s "$REF" | grep -E -m 1 '^Fix coverity defects')
if [ -n "$subject" ]; then if [ -n "$subject" ]; then
return 0 return 0
fi fi
@ -70,7 +70,7 @@ coverity_fix_commit()
error=0 error=0
# subject starts with Fix coverity defects: CID dddd, dddd... # subject starts with Fix coverity defects: CID dddd, dddd...
subject=$(git log -n 1 --pretty=%s "$REF" | subject=$(git log --no-show-signature -n 1 --pretty=%s "$REF" |
grep -E -m 1 'Fix coverity defects: CID [[:digit:]]+(, [[:digit:]]+)*') grep -E -m 1 'Fix coverity defects: CID [[:digit:]]+(, [[:digit:]]+)*')
if [ -z "$subject" ]; then if [ -z "$subject" ]; then
echo "error: Coverity defect fixes must have a subject line that starts with \"Fix coverity defects: CID dddd\"" echo "error: Coverity defect fixes must have a subject line that starts with \"Fix coverity defects: CID dddd\""
@ -86,7 +86,7 @@ coverity_fix_commit()
OLDIFS=$IFS OLDIFS=$IFS
IFS=' IFS='
' '
for line in $(git log -n 1 --pretty=%b "$REF" | grep -E '^CID'); do for line in $(git log --no-show-signature -n 1 --pretty=%b "$REF" | grep -E '^CID'); do
if ! echo "$line" | grep -qE '^CID [[:digit:]]+: ([[:graph:]]+|[[:space:]])+ \(([[:upper:]]|\_)+\)'; then if ! echo "$line" | grep -qE '^CID [[:digit:]]+: ([[:graph:]]+|[[:space:]])+ \(([[:upper:]]|\_)+\)'; then
echo "error: commit message has an improperly formatted CID defect line" echo "error: commit message has an improperly formatted CID defect line"
error=1 error=1