diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2018-11-14 18:49:54 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2018-11-16 10:22:00 +0000 |
| commit | bfe7eda028896652d0c5fae3900ef54dd0860ed7 (patch) | |
| tree | 8fe3968978216a74fc089c02b684fbd70adfc084 /bin | |
| parent | 221a8e3366dcaef54c4773fbbbc9e2caa786d5b9 (diff) | |
bin/get-pick-list.sh: handle reverts prior to the branchpoint
Currently we detect when a breaking commit:
- has landed in stable, and
- is referenced by a untagged fix in master
Yet we did not consider the case of breaking commit:
- prior to the branchpoint, and
- is referenced by a untagged fix in master
Addressing the latter is extremely slow, due to the size of the lookup.
That said, we can trivially use the existing is_sha_nomination() helper
to catch reverts.
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit adbdfc6666052d604a97009d736b6dee957908a0)
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 |