3 # Script for generating a list of candidates for cherry-picking to a stable branch
7 # $ bin/get-pick-list.sh
8 # $ bin/get-pick-list.sh > picklist
9 # $ bin/get-pick-list.sh | tee picklist
11 # Use the last branchpoint as our limit for the search
12 latest_branchpoint
=`git merge-base origin/master HEAD`
14 # Grep for commits with "cherry picked from commit" in the commit message.
15 git log
--reverse --pretty=medium
--grep="cherry picked from commit" $latest_branchpoint..HEAD |\
16 grep "cherry picked from commit" |\
17 sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
19 # Grep for commits that were marked as a candidate for the stable tree.
20 git log
--reverse --pretty=%H
-i --grep='^CC:.*mesa-stable' $latest_branchpoint..origin
/master |\
23 # Check to see whether the patch is on the ignore list.
24 if [ -f bin
/.cherry-ignore
] ; then
25 if grep -q ^
$sha bin
/.cherry-ignore
; then
30 # Check to see if it has already been picked over.
31 if grep -q ^
$sha already_picked
; then
35 git log
-n1 --pretty=oneline
$sha |
cat