get_commit: cpture all the Signed-off-bys as Ccs

[next-scripts] / check_fixes

diff --git a/check_fixes b/check_fixes
index 954ad553d04f023fe950b9471181b50340d33ab8..d75e1efc7f8b49e94577ac47f0170a8ca5f825fd 100755 (executable)
--- a/check_fixes
+++ b/check_fixes
@@ -12,9 +12,12 @@ fi
 
 # This should be a git tree that contains *only* Linus' tree
 Linus_tree="${HOME}/kernels/linus.git"
-split_re='^([[:xdigit:]]+)[[:space:]]+(.*)$'
+
+split_re='^([Cc][Oo][Mm][Mm][Ii][Tt])?[[:space:]]*([[:xdigit:]]{5,})([[:space:]]*)(.*)$'
 nl=$'\n'
+tab=$'\t'
 
+# Strip the leading and training spaces from a string
 strip_spaces()
 {
        [[ "$1" =~ ^[[:space:]]*(.*[^[:space:]])[[:space:]]*$ ]]
@@ -24,22 +27,42 @@ strip_spaces()
 for c in $commits; do
 
        commit_log=$(git log -1 --format='%h ("%s")' "$c")
-       commit_msg=$(printf 'In commit\n\n  %s\n\n' "$commit_log")
+       commit_msg="In commit
+
+  $commit_log
+
+"
 
        fixes_lines=$(git log -1 --format='%B' "$c" |
                        grep -i '^[[:space:]]*Fixes:')
 
        while read -r fline; do
-               f=$(echo "$fline" | sed 's/^[[:space:]]*Fixes:[[:space:]]*//i')
-               fixes_msg=$(printf 'Fixes tag\n\n  %s\n\n has these problem(s):\n\n' "$fline")
+               [[ "$fline" =~ ^[[:space:]]*[Ff][Ii][Xx][Ee][Ss]:[[:space:]]*(.*)$ ]]
+               f="${BASH_REMATCH[1]}"
+               fixes_msg="Fixes tag
+
+  $fline
+
+has these problem(s):
+
+"
                sha=
                subject=
                msg=
-               [[ "$f" =~ $split_re ]]
-               sha="${BASH_REMATCH[1]}"
-               subject="${BASH_REMATCH[2]}"
-
-               if [ -z "$sha" ]; then
+               if [[ "$f" =~ $split_re ]]; then
+                       first="${BASH_REMATCH[1]}"
+                       sha="${BASH_REMATCH[2]}"
+                       spaces="${BASH_REMATCH[3]}"
+                       subject="${BASH_REMATCH[4]}"
+                       if [ "$first" ]; then
+                               msg="${msg:+${msg}${nl}}  - leading word '$first' unexpected"
+                       fi
+                       if [ -z "$subject" ]; then
+                               msg="${msg:+${msg}${nl}}  - missing subject"
+                       elif [ -z "$spaces" ]; then
+                               msg="${msg:+${msg}${nl}}  - missing space between the SHA1 and the subject"
+                       fi
+               else
                        printf '%s%s  - %s\n' "$commit_msg" "$fixes_msg" 'No SHA1 recognised'
                        commit_msg=''
                        continue
@@ -51,7 +74,7 @@ for c in $commits; do
                fi
 
                if [ "${#sha}" -lt 12 ]; then
-                       msg="${msg:+${msg}${nl}}  - SHA1 should be at least 12 digits long"
+                       msg="${msg:+${msg}${nl}}  - SHA1 should be at least 12 digits long${nl}    Can be fixed by setting core.abbrev to 12 (or more) or (for git v2.11${nl}    or later) just making sure it is not set (or set to \"auto\")."
                fi
                # reduce the subject to the part between () if there
                if [[ "$subject" =~ ^\((.*)\) ]]; then
@@ -62,7 +85,7 @@ for c in $commits; do
                fi
 
                # strip matching quotes at the start and end of the subject
-               # the second characters in the classes are
+               # the unicode characters in the classes are
                # U+201C LEFT DOUBLE QUOTATION MARK
                # U+201D RIGHT DOUBLE QUOTATION MARK
                # U+2018 LEFT SINGLE QUOTATION MARK
@@ -105,7 +128,7 @@ for c in $commits; do
                target_subject=$(strip_spaces "$target_subject")
 
                if [ "$subject" != "${target_subject:0:${#subject}}" ]; then
-                       msg="${msg:+${msg}${nl}}  - Subject does not match target commit subject"
+                       msg="${msg:+${msg}${nl}}  - Subject does not match target commit subject${nl}    Just use${nl}${tab}git log -1 --format='Fixes: %h (\"%s\")'"
                fi
                lsha=$(cd "$Linus_tree" && git rev-parse -q --verify "$sha")
                if [ -z "$lsha" ]; then