summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-03-05 14:51:26 -0800
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-04-17 12:52:03 +0200
commita843ae5e3935a0df56f9ff78df0c66ff38246716 (patch)
tree25ff10aa1258b60c33615d8a4ea230590a461760
parent78a86019c0f5ecccf9cba29ecdd80c3daf4a72f5 (diff)
mesa: Modify candidate search string
Several commits on master for the 9.1 branch had "NOTE" messages in a slightly different format. NOTE: This is a candidate for stable branches Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 674f9239b95847e84d036ec084edc6c780bcf604)
-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 a141afe265..d3ac511c14 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -8,7 +8,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: This is a candidate' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: .*[Cc]andidate' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.