diff options
| -rwxr-xr-x | bin/get-pick-list.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index ad97d06..3920a9b 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -2,11 +2,11 @@ # Script for generating a list of candidates for cherry-picking to a stable branch -git log --reverse --pretty=%H HEAD..origin/master |\ +# 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 was marked as a candidate for the stable tree. - if git log -n1 $sha | grep -iq '^[[:space:]]*NOTE: This is a candidate' ; then + # 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 @@ -19,5 +19,4 @@ do fi git log -n1 --pretty=oneline $sha | cat - fi done |