bin/get-{extra,fixes}-pick-list.sh: add support for ignore list

Both scripts does not use a file with the commits to ignore. So if we
have handled one of the suggested commits and decided we won't pick it,
the scripts will continue suggesting them.

v2:
- Mark the candidates in bin/get-extra-pick-list.sh (Juan A. Suarez)
- Use bin/.cherry-ignore to store rejected patches (Emil)

Reviewed-by: Emil Velikov <[email protected]>

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