diff options
| author | Emil Velikov <[email protected]> | 2018-11-08 15:05:19 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-11-15 15:55:44 +0000 |
| commit | 209525aafb8314f827838dedeb771b72c256a4d3 (patch) | |
| tree | d917c499fd1c2a3fb6234ac8bc1da0a944724b0b | |
| parent | b7418d1f3f102aeed8d3d38195f9b7d672216df0 (diff) | |
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: [email protected]
Reviewed-by: Juan A. Suarez <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
| -rwxr-xr-x | bin/get-pick-list.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index c456fdb3b81..d327c61d254 100755 --- 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. |