[Mesa-dev] [PATCH 1/6] bin/get-extra-pick-list: use git merge-base to get the branchpoint

Emil Velikov emil.l.velikov at gmail.com
Mon Feb 13 13:39:56 UTC 2017

From: Emil Velikov <emil.velikov at collabora.com>

Since mesa development history is linear and the only diversion is at
the branchpoint. Thus we can drop the ad-hoc parsing and use git
merge-base to retrieve it.

Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
 bin/get-extra-pick-list.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index a9d25b97e6..f292d3ec8b 100755
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -10,8 +10,7 @@
 # $ 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 |\

More information about the mesa-dev mailing list