path: root/bin
diff options
authorAndreas Boll <>2012-10-19 23:13:12 +0200
committerAndreas Boll <>2012-10-23 19:26:56 +0200
commit135ec3a1db0de50e2bb3c57d4bf76f87ac80320f (patch)
tree6b1e3030b031bfdb9b763099d1fe36d64c443e96 /bin
parentb2991526ed6faa713e3cf640fcdbbad68d991f3e (diff)
mesa: grep for commits with cherry picked in commit message only once
and save them temporary in already_picked NOTE: This is a candidate for the stable branches. Reviewed-by: Ian Romanick <>
Diffstat (limited to 'bin')
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/ b/bin/
index 3920a9baaff..363bac761ae 100755
--- a/bin/
+++ b/bin/
@@ -2,6 +2,11 @@
# Script for generating a list of candidates for cherry-picking to a stable branch
+# Grep for commits with "cherry picked from commit" in the commit message.
+git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
+ grep "cherry picked from commit" |\
+ 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: This is a candidate' HEAD..origin/master |\
while read sha
@@ -14,9 +19,11 @@ do
# Check to see if it has already been picked over.
- if git log origin/master..HEAD | grep -q "cherry picked from commit $sha"; then
- continue
+ if grep -q ^$sha already_picked ; then
+ continue
git log -n1 --pretty=oneline $sha | cat
+rm -f already_picked