diff options
| author | Emil Velikov <[email protected]> | 2015-12-03 15:17:32 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-12-03 18:43:11 +0000 |
| commit | fba4d236dedb2f43f18dc7036f3dd2f04096d24d (patch) | |
| tree | e71bd29ceeaef2fda60773706ff2c56e2c13284e | |
| parent | 7bb68405ecdec65dbb910e975eb26b216a05afc9 (diff) | |
get-pick-list.sh: Require explicit "11.0" for nominating stable patches
A nomination unadorned with a specific version is now interpreted as
being aimed at the 11,0 branch, which was recently opened.
Signed-off-by: Emil Velikov <[email protected]>
| -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 0902fd08077..33e8f55600a 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:.*11\.0.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |