From 3f2da6cb739f9d288f81abebb0f4bf94d266075d Mon Sep 17 00:00:00 2001 From: Giuseppe Di Natale Date: Mon, 3 Apr 2017 14:20:01 -0700 Subject: Prevent commitcheck.sh from running twice A stray semicolon was causing commitcheck.sh to run twice when running make checkstyle. Updated regexes for matching tagged lines. Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Signed-off-by: Giuseppe Di Natale Closes #5952 --- scripts/commitcheck.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts/commitcheck.sh') diff --git a/scripts/commitcheck.sh b/scripts/commitcheck.sh index 723109112..5bef3375d 100755 --- a/scripts/commitcheck.sh +++ b/scripts/commitcheck.sh @@ -11,12 +11,14 @@ function test_url() echo "\"$url\" is unreachable" return 1 fi + + return 0 } # check for a tagged line function check_tagged_line() { - regex='^\s*'"$1"':\s+\S+\s+\<\S+\>' + regex='^\s*'"$1"':\s[[:print:]]+\s<[[:graph:]]+>$' foundline=$(git log -n 1 "$REF" | egrep -m 1 "$regex") if [ -z "$foundline" ]; then echo "error: missing \"$1\"" @@ -29,7 +31,7 @@ function check_tagged_line() # check for a tagged line and check that the link is valid function check_tagged_line_with_url () { - regex='^\s*'"$1"':\s+\K(\S+)' + regex='^\s*'"$1"':\s\K([[:graph:]]+)$' foundline=$(git log -n 1 "$REF" | grep -Po "$regex") if [ -z "$foundline" ]; then echo "error: missing \"$1\"" -- cgit v1.2.3