diff options
Diffstat (limited to 'bin')
| -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 e7fffdd1280..9f9cbc44026 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -71,6 +71,11 @@ is_brokenby_nomination() is_sha_nomination "$1" "broken by" } +is_revert_nomination() +{ + is_sha_nomination "$1" "This reverts commit " +} + # Use the last branchpoint as our limit for the search latest_branchpoint=`git merge-base origin/master HEAD` @@ -83,7 +88,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\>\|\<broken by\>' $latest_branchpoint..origin/master |\ +git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>\|This reverts commit' $latest_branchpoint..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. @@ -106,6 +111,8 @@ do tag=fixes elif is_brokenby_nomination "$sha"; then tag=brokenby + elif is_revert_nomination "$sha"; then + tag=revert else continue fi |