diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-02-13 00:13:55 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-02-23 19:34:59 +0000 |
| commit | a57d1af090f8c3bc8c49731996eab7f0cc8c11f4 (patch) | |
| tree | f2c8167b36e07eb4f7ee4e08cfde763becc18282 /bin | |
| parent | 173a2ab5c7db6e54f04c17fd86b0e36b4966bdcc (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" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit cb1947eac70f63d78835a5442017b1f3b7099d77)
Diffstat (limited to 'bin')
| -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 |\ |