Mesa (master): get-pick-list: Allow for non-whitespace between "CC:" and " mesa-stable"

Carl Worth cworth at kemper.freedesktop.org
Wed Jul 31 22:51:34 UTC 2013


Module: Mesa
Branch: master
Commit: c6f3036179dc187770caa741da0aa073b807b1cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6f3036179dc187770caa741da0aa073b807b1cf

Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jul 31 15:49:48 2013 -0700

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 at lists.freedesktop.org>

and this has already appeared in the wild.

So we extend the regular expression to pick this up as well.

---

 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 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.




More information about the mesa-commit mailing list