bin/get-pick-list.sh: flesh out is_sha_nomination

Refactor is_fixes_nomination into a is_sha_nomination helper. This way
we can reuse it for more than the usual "Fixes:" tag.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 05dd3820e1262852ba30b245799152650860d934..c456fdb3b81106dc88d903a2cbab2dccb543bb40 100755 (executable)
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -21,10 +21,12 @@ is_typod_nomination()
        git show --summary "$1" | grep -q -i -o "CC:.*mesa-dev"
 }
 
-is_fixes_nomination()
+# Helper to handle various mistypos of the fixes tag.
+# The tag string itself is passed as argument and normalised within.
+is_sha_nomination()
 {
        fixes=`git show --pretty=medium -s $1 | tr -d "\n" | \
-               sed -e 's/fixes:[[:space:]]*/\nfixes:/Ig' | \
+               sed -e 's/'"$2"'/\nfixes:/Ig' | \
                grep -Eo 'fixes:[a-f0-9]{8,40}'`
 
        fixes_count=`echo "$fixes" | wc -l`
@@ -55,6 +57,11 @@ is_fixes_nomination()
        return 1
 }
 
+is_fixes_nomination()
+{
+       is_sha_nomination "$1" "fixes:[[:space:]]*"
+}
+
 # Use the last branchpoint as our limit for the search
 latest_branchpoint=`git merge-base origin/master HEAD`