diff options
| author | Carl Worth <cworth@cworth.org> | 2014-05-05 13:27:11 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-05-05 13:27:11 -0700 |
| commit | 994203bf5e4098da31401b86782b6037016b51d0 (patch) | |
| tree | df4c63dd9b2396dc892dc824e90af03a82d97215 | |
| parent | 08da743a97884ef8a5031f37f91a7f45ffc1a258 (diff) | |
| download | mesa-994203bf5e4098da31401b86782b6037016b51d0.tar.gz | |
get-pick-list.sh: Require explicit "10.1" for nominating stable patches
A nomination unadorned with a specific version is now interpreted as being
aimed at the 10.2 branch, (which was recently opened).
| -rwxr-xr-x | bin/get-pick-list.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 0902fd0807..840f5fb8dc 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -14,7 +14,7 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked # Grep for commits that were marked as a candidate for the stable tree. -git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\ +git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*10\.1.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |