summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2013-07-31 15:49:48 -0700
committerCarl Worth <cworth@cworth.org>2013-07-31 15:49:48 -0700
commitc6f3036179dc187770caa741da0aa073b807b1cf (patch)
tree6f558bc26949ab79676ff559feb482a1ad89636e /bin
parentef6d5ee9f34bce89c8bb8ff001be4c70a2a5421d (diff)
downloadexternal_mesa3d-c6f3036179dc187770caa741da0aa073b807b1cf.zip
external_mesa3d-c6f3036179dc187770caa741da0aa073b807b1cf.tar.gz
external_mesa3d-c6f3036179dc187770caa741da0aa073b807b1cf.tar.bz2
get-pick-list: Allow for non-whitespace between "CC:" and "mesa-stable"
We recently proposed a new syntax for stable-patch nominations such as: CC: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> and this has already appeared in the wild. So we extend the regular expression to pick this up as well.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/get-pick-list.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index b9def6b..0902fd0 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:[[:space:]]*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.