v3d: Primitive Counts Feedback needs an extra 32-bit padding.

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

diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index a9d25b97e6bac9c7094f45b907342e6dbfd3fd16..b42085f2abad5ebd15af5fa9780007b21e7b961d 100755 (executable)
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -10,26 +10,36 @@
 # $ bin/get-extra-pick-list.sh | tee picklist
 
 # Use the last branchpoint as our limit for the search
-# XXX: there should be a better way for this
-latest_branchpoint=`git branch | grep \* | cut -c 3-`-branchpoint
+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/)//' |\
-       cut -c -8 |\
+       sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//'  > already_picked
+
+# For each cherry-picked commit...
+cat already_picked | cut -c -8 |\
 while read sha
 do
-       # Check if the original commit is referenced in master
+       # ... check if it's referenced (fixed by another) patch
        git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\
                cut -c -8 |\
        while read candidate
        do
-               # Check if the potential fix, hasn't landed in branch yet.
-               found=`git log -n1 --pretty=oneline --reverse --grep=$candidate $latest_branchpoint..HEAD |wc -l`
-               if test $found = 0
-               then
-                       echo Commit $candidate might need to be picked, as it references $sha
+               # And flag up if it hasn't landed in branch yet.
+               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
+               printf "Commit \"%s\" references %s\n" \
+                      "`git log -n1 --pretty=oneline $candidate`" \
+                      "$sha"
        done
 done
+
+rm -f already_picked