From c6f3036179dc187770caa741da0aa073b807b1cf Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 31 Jul 2013 15:49:48 -0700 Subject: [PATCH] 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" 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 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index b9def6b2f21..0902fd08077 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. -- 2.30.2