summaryrefslogtreecommitdiff
path: root/bin/get-pick-list.sh
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2013-07-30 12:36:37 -0700
committerCarl Worth <cworth@cworth.org>2013-07-30 12:36:37 -0700
commit122d8d2f5a28030f2397d61d49f3873c8db6a987 (patch)
treef9b44fbcfc64a274c74177e48a0f51602b95c020 /bin/get-pick-list.sh
parent1299694ed5e3c2f51c076b020a9ad2fef2e1d059 (diff)
get-pick-list.sh: Include commits mentionining "CC: mesa-stable..." in pick list
We recently adopted a new convention that patches can be nominated for the stable branch by including a line in the commit message as follows: CC: mesa-stable@lists.freedesktop.org This is a convenient syntax as "git send-email" will notice this line and automatically copy the resulting patch email to the mesa-stable mailing list. Here we extend the regular expression in the get-pick-list.sh script to also notice this pattern, (as well as the traditional "NOTE: This patch is a candidate..." form.
Diffstat (limited to 'bin/get-pick-list.sh')
-rwxr-xr-xbin/get-pick-list.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index d2b76e7e633..b9def6b2f21 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' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:[[:space:]]*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.