summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2012-10-22 21:18:17 +0200
committerAndreas Boll <andreas.boll.dev@gmail.com>2012-11-14 20:45:33 +0100
commitca8988673baa65107a1b8f6f59b671725d9e4814 (patch)
treec2c23b8ebcbbe4cb7d6f3eb2e4bb76b2c3f9c327
parentb85a8cd208a86a5aa9420fbae82e2d84de8945a2 (diff)
mesa: use .cherry-ignore in the get-pick-list.sh script
NOTE: This is a candidate for the stable branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rwxr-xr-xbin/get-pick-list.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 72880907b11..a141afe2650 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