bin/get-typod-pick-list.sh: limit `git grep ...' to only as needed
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
Improve things by limiting the look ups to the branch point.
Cc: "13.0 17.0" <firstname.lastname@example.org>
Signed-off-by: Emil Velikov <email@example.com>
Reviewed-by: Eric Engestrom <firstname.lastname@example.org>
(cherry picked from commit d292f12d94b0a940e4534451f62d5afed812374b)
diff --git a/bin/get-typod-pick-list.sh b/bin/get-typod-pick-list.sh
index 2fe3d89..eb4181d 100755
@@ -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
# Check to see whether the patch is on the ignore list.