diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-04-11 21:01:44 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-04-11 21:01:44 +0100 |
| commit | 6847733bb4f93faa2c38b069249bb792cc461edd (patch) | |
| tree | 1a7166a4b25809ba98ad7421fbca17479b6563e2 /bin/get-pick-list.sh | |
| parent | a85e5044c52c83945e5d5b6638f81789cdcf3701 (diff) | |
get-pick-list.sh: Require explicit "11.1" for nominating stable patches
A nomination unadorned with a specific version is now interpreted as
being aimed at the 11.1 branch, which was recently opened.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'bin/get-pick-list.sh')
| -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..f991f1452ec 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\.1.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |