From cb1947eac70f63d78835a5442017b1f3b7099d77 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 13 Feb 2017 00:13:55 +0000 Subject: [PATCH] bin/get-extra-pick-list: use git merge-base to get the branchpoint 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" Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom --- 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 a9d25b97e6b..f292d3ec8b5 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 |\ -- 2.30.2