#!/bin/sh # Script for generating a list of candidates for cherry-picking to a stable branch # # Usage examples: # # $ bin/get-pick-list.sh # $ bin/get-pick-list.sh > picklist # $ bin/get-pick-list.sh | tee picklist # # The output is as follows: # [nomination_type] commit_sha commit summary is_stable_nomination() { git show --summary "$1" | grep -q -i -o "CC:.*mesa-stable" } is_typod_nomination() { git show --summary "$1" | grep -q -i -o "CC:.*mesa-dev" } # Use the last branchpoint as our limit for the search latest_branchpoint=`git merge-base origin/master HEAD` # Grep for commits with "cherry picked from commit" in the commit message. git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_branchpoint..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='^CC:.*mesa-stable\|^CC:.*mesa-dev' $latest_branchpoint..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. if [ -f bin/.cherry-ignore ] ; then if grep -q ^$sha bin/.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 if is_stable_nomination "$sha"; then tag=stable elif is_typod_nomination "$sha"; then tag=typod else continue fi printf "[ %8s ] " "$tag" git --no-pager show --summary --oneline $sha done rm -f already_picked