diff options
| -rwxr-xr-x | bin/get-extra-pick-list.sh | 6 | ||||
| -rwxr-xr-x | bin/get-fixes-pick-list.sh | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh index 4d3938931fb..dbd5474befa 100755 --- a/bin/get-extra-pick-list.sh +++ b/bin/get-extra-pick-list.sh @@ -30,6 +30,12 @@ do if grep -q ^$candidate already_picked ; then continue fi + # Or if it isn't in the ignore list. + if [ -f bin/.cherry-ignore ] ; then + if grep -q ^$candidate bin/.cherry-ignore ; then + continue + fi + fi echo Commit $candidate references $sha done done diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh index 75242a22829..73afd0c22a1 100755 --- a/bin/get-fixes-pick-list.sh +++ b/bin/get-fixes-pick-list.sh @@ -24,6 +24,13 @@ git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD | git log --reverse --pretty=%H -i --grep="fixes:" $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 + # For each one try to extract the tag fixes_count=`git show $sha | grep -i "fixes:" | wc -l` if [ "x$fixes_count" != x1 ] ; then |