bin/get-pick-list.sh: handle fixes tag with missing colon

Every so often, we forget to add the colon after "fixes". Trivially
tweak the script to catch it.

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 c456fdb3b81106dc88d903a2cbab2dccb543bb40..d327c61d25436ee6a305810c80f0f9ff9366a22c 100755 (executable)
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -60,6 +60,10 @@ is_sha_nomination()
 is_fixes_nomination()
 {
        is_sha_nomination "$1" "fixes:[[:space:]]*"
+       if test $? -eq 0; then
+               return 0
+       fi
+       is_sha_nomination "$1" "fixes[[:space:]]\+"
 }
 
 # Use the last branchpoint as our limit for the search
@@ -74,7 +78,7 @@ git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_bra
        sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
 
 # Grep for potential candidates
-git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|fixes:' $latest_branchpoint..origin/master |\
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>' $latest_branchpoint..origin/master |\
 while read sha
 do
        # Check to see whether the patch is on the ignore list.