summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJuan A. Suarez Romero <jasuarez@igalia.com>2017-04-05 20:14:22 +0200
committerJuan A. Suarez Romero <jasuarez@igalia.com>2017-04-20 10:28:21 +0200
commit99b41631bb98d154df3dd01f17edd5e5a6a7d1f1 (patch)
tree683265f5ba22a0f3a69e60b007b60ba85de68bc1 /bin
parent8a7e3693c8efe540256739eff233b2e88ab293a6 (diff)
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>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/get-extra-pick-list.sh6
-rwxr-xr-xbin/get-fixes-pick-list.sh7
2 files changed, 13 insertions, 0 deletions
diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index 4d3938931f..dbd5474bef 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 75242a2282..73afd0c22a 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