diff options
| author | Emil Velikov <[email protected]> | 2018-11-08 15:05:20 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-11-15 15:57:37 +0000 |
| commit | c8fef27cd37c0d4f09275fda12d0ab9882ec68fe (patch) | |
| tree | 01345a63a0c9215bccb06692e80b19779feda04c | |
| parent | 4505df167696c2b535c7e5d6582351741b5638ea (diff) | |
bin/get-pick-list.sh: handle unofficial "broken by" tag
We have a number of cases were devs will use a tag "broken by".
While it's not something officially documented or recommended, checking
for it is trivial enough.
Cc: [email protected]
Reviewed-by: Juan A. Suarez <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
(cherry picked from commit 77ff0bfb5f915bb841623ec181ee359a099f2c52)
| -rwxr-xr-x | bin/get-pick-list.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index d327c61d254..a540cedfbd0 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -66,6 +66,11 @@ is_fixes_nomination() is_sha_nomination "$1" "fixes[[:space:]]\+" } +is_brokenby_nomination() +{ + is_sha_nomination "$1" "broken by" +} + # Use the last branchpoint as our limit for the search latest_branchpoint=`git merge-base origin/master HEAD` @@ -78,7 +83,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\>\|\<broken by\>' $latest_branchpoint..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. @@ -99,6 +104,8 @@ do tag=typod elif is_fixes_nomination "$sha"; then tag=fixes + elif is_brokenby_nomination "$sha"; then + tag=brokenby else continue fi |