diff options
author | Juan A. Suarez Romero <jasuarez@igalia.com> | 2019-09-10 10:30:43 +0200 |
---|---|---|
committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2019-10-02 09:41:27 -0400 |
commit | 895f0a2ca29168566e933fc7c21dbfd238e50a9a (patch) | |
tree | 09bb91eb15abff775767ca6be3d1095aa2a58bfc | |
parent | 9ee9251ef89356f8704c6eb1580aa522b9ac4d64 (diff) | |
download | mesa-895f0a2ca29168566e933fc7c21dbfd238e50a9a.tar.gz |
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@intel.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
(cherry picked from commit b3c25e6f9953b6c7d196b47c6ba1987f681edf7d)
-rwxr-xr-x | bin/get-pick-list.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 8fa4f438771..1db6884d4ab 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 |