Mesa (staging/19.2): bin/get-pick-list.sh: sha1 commits can be smaller than 8 chars

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: c90dc1232dddcc41dcfca8316165015832f551c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c90dc1232dddcc41dcfca8316165015832f551c0

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Tue Sep 10 10:30:43 2019 +0200

bin/get-pick-list.sh: sha1 commits can be smaller than 8 chars

The script only handles commits with "Fixes: <sha1>" where <sha1> is
equal or great than 8 chars. But <sha1> can be smaller, like 7 chars.

This commit relax the restriction to handle <sha1> 4 or more chars.

Fixes: 533fead4236 ("bin/get-pick-list.sh: tweak the commit sha matching pattern")

Acked-by: Eric Engestrom <eric.engestrom at intel.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>
(cherry picked from commit b3c25e6f9953b6c7d196b47c6ba1987f681edf7d)

---

 bin/get-pick-list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 86a0c41938b..9cbef061731 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -32,7 +32,7 @@ is_sha_nomination()
 {
 	fixes=`git show --pretty=medium -s $1 | tr -d "\n" | \
 		sed -e 's/'"$2"'/\nfixes:/Ig' | \
-		grep -Eo 'fixes:[a-f0-9]{8,40}'`
+		grep -Eo 'fixes:[a-f0-9]{4,40}'`
 
 	fixes_count=`echo "$fixes" | grep "fixes:" | wc -l`
 	if test $fixes_count -eq 0; then