Module: Mesa
Branch: 10.4
Commit: b786e6332b8baefa449ced8d81942f0045ba6df4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b786e6332b8baefa449ced8d81942f0045ba6df4
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Wed Feb 18 11:44:20 2015 +0000
get-pick-list.sh: Require explicit "10.4" for nominating stable patches
A nomination unadorned with a specific version is now interpreted as
being aimed at the 10.5 branch, which was recently opened.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
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 0902fd0..1a574aa 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\.4.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
