bin/get-typod-pick-list.sh: limit `git grep ...' to only as needed
authorEmil Velikov <emil.velikov@collabora.com>
Mon, 13 Feb 2017 00:32:21 +0000 (00:32 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 16 Feb 2017 15:17:52 +0000 (15:17 +0000)
The currently used range HEAD..origin/master is far too broad. It looks
for nominations within the already_landed list (branchpoint..HEAD).

Similarly we look for already_landed whiting the [possible] nominations
Rand branchpoint..origin/master.

Improve things by limiting the look ups to the branch point.

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>
bin/get-typod-pick-list.sh

index 2fe3d8918b2777816f310b4b671ccd8e6e8a5e84..eb4181d66b83f850d1e3139bb95902eaf3b0bec9 100755 (executable)
 # This script intentionally _never_ checks for specific version tag
 # Should we consider folding it with the original get-pick-list.sh
 
+# 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" origin/master..HEAD |\
+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-dev' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-dev' $latest_branchpoint..origin/master |\
 while read sha
 do
        # Check to see whether the patch is on the ignore list.