Revert "etnaviv: add support for snorm textures"

[mesa.git] / bin / get-pick-list.sh

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index aae8fd544373274c1cdf01eff23de83e2f366e6e..1bd0b367d8b6b27a6358f0ef85a78fba61d82783 100755 (executable)
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -1,21 +1,38 @@
 #!/bin/sh
 
-git log --reverse --pretty=oneline HEAD..origin/master | cut -d' ' -f1 |\
+# 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
+
+# Use the last branchpoint as our limit for the search
+latest_branchpoint=`git merge-base origin/master HEAD`
+
+# Grep for commits with "cherry picked from commit" in the commit message.
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
+       grep "cherry picked from commit" |\
+       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='^CC:.*mesa-stable' $latest_branchpoint..origin/master |\
 while read sha
 do
-    # Check to see whether the patch was marked as a candidate for the stable tree.
-    if git log -n1 $sha | grep -iq '^[[:space:]]*NOTE: This is a candidate' ; then
-       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.
-       if git log origin/master..HEAD | grep -q "cherry picked from commit $sha"; then
-           continue
+       if grep -q ^$sha already_picked ; then
+               continue
        fi
 
        git log -n1 --pretty=oneline $sha | cat
-    fi
 done
+
+rm -f already_picked