aboutsummaryrefslogtreecommitdiff
path: root/mesalib/bin/get-pick-list.sh
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-25 14:46:10 +0200
committermarha <marha@users.sourceforge.net>2012-10-25 14:46:10 +0200
commitf6c8097ba5b5bb714185762dbd0ff9958d23e804 (patch)
tree222a1d19624e55a205786f54edd7892aae79a7bd /mesalib/bin/get-pick-list.sh
parentb929a2bab9e244cbc823f7bb2fe9e21537e3ceb7 (diff)
parent281f26a1dfda732687680a36857960f74608df5b (diff)
downloadvcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.gz
vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.bz2
vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman git update
Diffstat (limited to 'mesalib/bin/get-pick-list.sh')
-rw-r--r--mesalib/bin/get-pick-list.sh29
1 files changed, 29 insertions, 0 deletions
diff --git a/mesalib/bin/get-pick-list.sh b/mesalib/bin/get-pick-list.sh
new file mode 100644
index 000000000..72880907b
--- /dev/null
+++ b/mesalib/bin/get-pick-list.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# 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
+do
+ # Check to see whether the patch is on the ignore list.
+ if [ -f .git/cherry-ignore ] ; then
+ if grep -q ^$sha .git/cherry-ignore ; then
+ continue
+ fi
+ fi
+
+ # Check to see if it has already been picked over.
+ if grep -q ^$sha already_picked ; then
+ continue
+ fi
+
+ git log -n1 --pretty=oneline $sha | cat
+done
+
+rm -f already_picked