diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-02-13 00:37:03 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-02-16 15:17:52 +0000 |
| commit | d6b1d11d4f58c3934a75446cfdf415407e65b3af (patch) | |
| tree | 1663991f73872b9d32da8eeac70d323affbc7e75 /bin | |
| parent | d292f12d94b0a940e4534451f62d5afed812374b (diff) | |
bin/get-pick-list.sh: limit `git grep ...' only as needed
Analogous to previous commit.
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>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/get-pick-list.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 0902fd0807..71d99b5707 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -8,13 +8,16 @@ # $ bin/get-pick-list.sh > picklist # $ bin/get-pick-list.sh | tee picklist +# Use the last branchpoint as our limit for the search +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" origin/master..HEAD |\ +git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\ grep "cherry picked from commit" |\ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked # Grep for commits that were marked as a candidate for the stable tree. -git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\ +git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' $latest_branchpoint..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |