diff options
| author | Carl Worth <cworth@cworth.org> | 2013-08-01 13:34:30 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-08-01 13:34:30 -0700 |
| commit | a33ecd80749902ca72f4a42feadb509eae551e1b (patch) | |
| tree | c9856c6ae44961c3adddc40c7b9813673fe2f75c | |
| parent | 4f26ea56120cffaa1a0c2337423cf08b835dffb8 (diff) | |
get-pick-list: Ignore commits which CC mesa-stable unless they say "9.1"
With the recent creation of the 9.2 branch, we're now seeing a steady flow of
new patches to mesa-stable@ intended for that branch. To avoid wasting effort
trying to apply these to 9.1, we now require developers to specifically
mention "9.1" to target the 9.1 branch.
| -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..0409341ee0 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:.*9\.1.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |