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 <emil.velikov@collabora.com>
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user