From 994203bf5e4098da31401b86782b6037016b51d0 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 5 May 2014 13:27:11 -0700 Subject: get-pick-list.sh: Require explicit "10.1" for nominating stable patches A nomination unadorned with a specific version is now interpreted as being aimed at the 10.2 branch, (which was recently opened). --- 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 0902fd0807..840f5fb8dc 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\|CC:.*10\.1.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. -- cgit v1.2.3