diff options
| author | Emil Velikov <[email protected]> | 2017-02-13 00:13:55 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-16 15:17:51 +0000 |
| commit | cb1947eac70f63d78835a5442017b1f3b7099d77 (patch) | |
| tree | ddc41696bacb9dec4e6265b39969e5f4d3023324 | |
| parent | 1c0a536a72990bd5388e6a7ab45a8fce5609a128 (diff) | |
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" <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rwxr-xr-x | bin/get-extra-pick-list.sh | 3 |
1 files changed, 1 insertions, 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 |\ |