diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-25 09:59:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-25 09:59:33 +0200 |
| commit | 281f26a1dfda732687680a36857960f74608df5b (patch) | |
| tree | 2dada31e73b6e8a6d4e1202999a88377d0eebbf3 /mesalib/bin | |
| parent | 34d741a3fc96c9424ffec29b114a1bdfde40f8b0 (diff) | |
| download | vcxsrv-281f26a1dfda732687680a36857960f74608df5b.tar.gz vcxsrv-281f26a1dfda732687680a36857960f74608df5b.tar.bz2 vcxsrv-281f26a1dfda732687680a36857960f74608df5b.zip | |
fontconfig mesa pixman git update
fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822
mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a
pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
Diffstat (limited to 'mesalib/bin')
| -rw-r--r-- | mesalib/bin/get-pick-list.sh | 29 |
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 |