This is a very rudimentary script that checks if any of the applied cherry-picks have been referenced (fixed?) by another patch(es) in master. With the latter missing the stable tag.
This can be improved upon greatly, and/or extended to handle "Fixed" tags. At this point I'd wanted to send it upstream before I unintentionally remove it (again). Cc: "10.6 11.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> --- bin/get-extra-pick-list.sh | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 bin/get-extra-pick-list.sh diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh new file mode 100755 index 0000000..5807430 --- /dev/null +++ b/bin/get-extra-pick-list.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# Script for generating a list of candidates address commits that have been +# previously cherry-picked to a stable branch. +# +# Usage examples: +# +# $ bin/get-extra-pick-list.sh +# $ bin/get-extra-pick-list.sh > picklist +# $ bin/get-extra-pick-list.sh | tee picklist + +# Use the last branchpoint as our limit for the search +# XXX: there should be a better way for this +latest_branchpoint=`git branch | grep \* | cut -c 3-`-branchpoint + +# Grep for commits with "cherry picked from commit" in the commit message. +git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\ + grep "cherry picked from commit" |\ + sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' |\ + cut -c -8 |\ +while read sha +do + # Check if the original commit is referenced in master + git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\ + cut -c -8 |\ + while read candidate + do + # Check if the potential fix, hasn't landed in branch yet. + found=`git log -n1 --pretty=oneline --reverse \ + --grep="cherry picked from commit $candidate" $latest_branchpoint..HEAD |wc -l` + if test $found = 0 + then + echo Commit $candidate might need to be picked, as it references $sha + fi + done +done -- 2.5.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
