diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-09-02 17:36:22 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-02-29 11:25:35 +0000 |
| commit | c212a70cd9d5f5731841e4194c57e8a77e0b4e41 (patch) | |
| tree | 2c630fb213e853ab33dbb46060c7e0a487bcf13b /bin | |
| parent | 64500f21f3b11986a72822244ea83efb16af3fca (diff) | |
| download | external_mesa3d-c212a70cd9d5f5731841e4194c57e8a77e0b4e41.zip external_mesa3d-c212a70cd9d5f5731841e4194c57e8a77e0b4e41.tar.gz external_mesa3d-c212a70cd9d5f5731841e4194c57e8a77e0b4e41.tar.bz2 | |
mesa; add get-extra-pick-list.sh script into bin/
This is a very rudimentary script that checks if any of the applied
cherry-picks have been referenced (fixed?) by another patch. With the
latter either missing the stable tag or hasn't yet been picked.
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/get-extra-pick-list.sh | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh new file mode 100755 index 0000000..a9d25b9 --- /dev/null +++ b/bin/get-extra-pick-list.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +# Script for generating a list of candidates which fix 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=$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 |