3 # Script for generating a list of candidates for cherry-picking to a stable branch
5 git log
--reverse --pretty=%H HEAD..origin
/master |\
8 # Check to see whether the patch was marked as a candidate for the stable tree.
9 if git log
-n1 $sha |
grep -iq '^[[:space:]]*NOTE: This is a candidate' ; then
10 if [ -f .git
/cherry-ignore
] ; then
11 if grep -q ^
$sha .git
/cherry-ignore
; then
16 # Check to see if it has already been picked over.
17 if git log origin
/master..HEAD |
grep -q "cherry picked from commit $sha"; then
21 git log
-n1 --pretty=oneline
$sha |
cat