From a843ae5e3935a0df56f9ff78df0c66ff38246716 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 5 Mar 2013 14:51:26 -0800 Subject: 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 (cherry picked from commit 674f9239b95847e84d036ec084edc6c780bcf604) --- 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 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. -- cgit v1.2.3