From c29c9947a3dfabd67f7a8b803cd072d75e659c59 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 10 Mar 2014 15:39:06 -0700 Subject: get-pick-list: Update to only find patches nominated for the 10.0 branch In early February, the 10.1 branch was created. From then on, patches that don't specifically say "10.0" are intended for 10.1, not 10.0. --- 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 0902fd08077..9f4dcbfbaca 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:.*mesa-stable\)' HEAD..origin/master |\ +git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate.*10\.0\|CC:.*10\.0.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. -- cgit v1.2.3