summaryrefslogtreecommitdiffstats
path: root/bin/get-extra-pick-list.sh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/get-extra-pick-list.sh')
-rwxr-xr-xbin/get-extra-pick-list.sh6
1 files changed, 6 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