summaryrefslogtreecommitdiff
path: root/bin/get-extra-pick-list.sh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/get-extra-pick-list.sh')
-rwxr-xr-xbin/get-extra-pick-list.sh3
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 |\