diff options
| author | Carl Worth <cworth@cworth.org> | 2013-10-04 13:52:46 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-10-04 13:52:46 -0700 |
| commit | a6b6ad7d172700cd970fee12d83b72abf67f3e79 (patch) | |
| tree | d0500dbc767e398917182a06e0702f002fd254cb | |
| parent | 68473d07d44835dad202597ee7957663f81808d2 (diff) | |
Update get-pick-list to look specifically for "9.1" in NOTE
We previously adjusted this script so that the new-style markup, (with CC)
would only trigger if it specifically mentioned "9.1", but the old-style
markup (with "NOTE:") was always triggering. Fix it to look for "9.1" as well.
This removes several patches from the current output.
| -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 0409341ee09..2a5c457d756 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:.*9\.1.*mesa-stable\)' HEAD..origin/master |\ +git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate.*9\.1\|CC:.*9\.1.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |