bin/get-extra-pick-list: rework to use already_picked list

Currently we loop (git log --grep) to check if the fix has landed. We
can simplify and make things faster by storing the already_picked list
and grep ping through it.

Slim down the message while we're here.

Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index f292d3ec8b5c749033653d2c65e464022b306df8..4d3938931fb9838e6b0023c913caef4a07ff1176 100755 (executable)
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -15,20 +15,23 @@ 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
+               echo Commit $candidate references $sha
        done
 done
+
+rm -f already_picked