From 4510df5464abb51af30bf595d68f9bd5f2689f9c Mon Sep 17 00:00:00 2001 From: Andreas Boll Date: Mon, 22 Oct 2012 21:18:17 +0200 Subject: [PATCH] mesa: use .cherry-ignore in the get-pick-list.sh script NOTE: This is a candidate for the stable branches. Reviewed-by: Ian Romanick (cherry picked from commit ca8988673baa65107a1b8f6f59b671725d9e4814) --- bin/get-pick-list.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 7288090..a141afe 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -12,8 +12,8 @@ git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' while read sha do # Check to see whether the patch is on the ignore list. - if [ -f .git/cherry-ignore ] ; then - if grep -q ^$sha .git/cherry-ignore ; then + if [ -f bin/.cherry-ignore ] ; then + if grep -q ^$sha bin/.cherry-ignore ; then continue fi fi -- 2.7.4