From c8fef27cd37c0d4f09275fda12d0ab9882ec68fe Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 8 Nov 2018 15:05:20 +0000 Subject: 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: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez Signed-off-by: Emil Velikov (cherry picked from commit 77ff0bfb5f915bb841623ec181ee359a099f2c52) --- bin/get-pick-list.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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\|\' $latest_branchpoint..origin/master |\ +git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\\|\' $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 -- cgit v1.2.3