X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fget-pick-list.sh;h=0902fd08077dec3d8d4a292159fa2b6ed3c58e09;hb=0e8dc81c3acf5999b6e9263ee320a4db31742119;hp=363bac761ae7c8239de3c08d315d6b3b0f313250;hpb=135ec3a1db0de50e2bb3c57d4bf76f87ac80320f;p=mesa.git

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 363bac761ae..0902fd08077 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 
 # Script for generating a list of candidates for cherry-picking to a stable branch
+#
+# Usage examples:
+#
+# $ bin/get-pick-list.sh
+# $ bin/get-pick-list.sh > picklist
+# $ bin/get-pick-list.sh | tee picklist
 
 # Grep for commits with "cherry picked from commit" in the commit message.
 git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
@@ -8,14 +14,14 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
 
 # Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
 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
-		continue
-	    fi
+	# 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
 
 	# Check to see if it has already been picked over.