diff options
| author | Carl Worth <cworth@cworth.org> | 2014-03-10 15:39:06 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-03-11 11:49:52 -0700 |
| commit | c29c9947a3dfabd67f7a8b803cd072d75e659c59 (patch) | |
| tree | 968af0b35bf5c7140de2df4772bc552375eb41b5 | |
| parent | 518526700ed7ab58067cd7d7e0ab9739895314d4 (diff) | |
get-pick-list: Update to only find patches nominated for the 10.0 branch
In early February, the 10.1 branch was created. From then on, patches that
don't specifically say "10.0" are intended for 10.1, not 10.0.
| -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..9f4dcbfbaca 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.*10\.0\|CC:.*10\.0.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |