When outputting an error for an invalid log prefix, don't just tell the
user that the prefix is wrong - also tell them what the expected prefix
should be.

Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
 devtools/check-git-log.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index 2ee7f2db64..9582f03dea 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -81,12 +81,13 @@ bad=$(for commit in $commits ; do
        drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
        drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
-               echo "$headline" | grep -v '^drivers:'
+               prefix='drivers:'
        elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
-               echo "$headline" | grep -v "^drivers/$drvgrp"
+               prefix="drivers/$drvgrp:"
        else
-               echo "$headline" | grep -v "^$drv"
+               prefix="$drv"
        fi
+       echo "$headline (expected prefix \"$prefix\")" | grep -v "^$prefix"
 done | sed 's,^,\t,')
 [ -z "$bad" ] || { printf "Wrong headline prefix:\n$bad\n" && failure=true;}
 
-- 
2.43.0

Reply via email to