nir: add initializer data to fix MSVC compile error

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

diff --git a/bin/get-typod-pick-list.sh b/bin/get-typod-pick-list.sh
index 2fe3d8918b2777816f310b4b671ccd8e6e8a5e84..eb4181d66b83f850d1e3139bb95902eaf3b0bec9 100755 (executable)
--- a/bin/get-typod-pick-list.sh
+++ b/bin/get-typod-pick-list.sh
@@ -12,13 +12,16 @@
 # 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.