From 6847733bb4f93faa2c38b069249bb792cc461edd Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 11 Apr 2016 21:01:44 +0100 Subject: [PATCH] get-pick-list.sh: Require explicit "11.1" for nominating stable patches A nomination unadorned with a specific version is now interpreted as being aimed at the 11.1 branch, which was recently opened. Signed-off-by: Emil Velikov --- 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..f991f1452ec 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:.*11\.1.*mesa-stable\)' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list.