Emil Velikov | c212a70 | 2015-09-02 17:36:22 +0100 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
| 3 | # Script for generating a list of candidates which fix commits that have been |
| 4 | # previously cherry-picked to a stable branch. |
| 5 | # |
| 6 | # Usage examples: |
| 7 | # |
| 8 | # $ bin/get-extra-pick-list.sh |
| 9 | # $ bin/get-extra-pick-list.sh > picklist |
| 10 | # $ bin/get-extra-pick-list.sh | tee picklist |
| 11 | |
| 12 | # Use the last branchpoint as our limit for the search |
Emil Velikov | cb1947e | 2017-02-13 00:13:55 +0000 | [diff] [blame] | 13 | latest_branchpoint=`git merge-base origin/master HEAD` |
Emil Velikov | c212a70 | 2015-09-02 17:36:22 +0100 | [diff] [blame] | 14 | |
| 15 | # Grep for commits with "cherry picked from commit" in the commit message. |
| 16 | git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\ |
| 17 | grep "cherry picked from commit" |\ |
Emil Velikov | 71e00d6 | 2017-02-11 12:45:21 +0000 | [diff] [blame] | 18 | sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked |
| 19 | |
| 20 | # For each cherry-picked commit... |
| 21 | cat already_picked | cut -c -8 |\ |
Emil Velikov | c212a70 | 2015-09-02 17:36:22 +0100 | [diff] [blame] | 22 | while read sha |
| 23 | do |
Emil Velikov | 71e00d6 | 2017-02-11 12:45:21 +0000 | [diff] [blame] | 24 | # ... check if it's referenced (fixed by another) patch |
Emil Velikov | c212a70 | 2015-09-02 17:36:22 +0100 | [diff] [blame] | 25 | git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\ |
| 26 | cut -c -8 |\ |
| 27 | while read candidate |
| 28 | do |
Emil Velikov | 71e00d6 | 2017-02-11 12:45:21 +0000 | [diff] [blame] | 29 | # And flag up if it hasn't landed in branch yet. |
| 30 | if grep -q ^$candidate already_picked ; then |
| 31 | continue |
Emil Velikov | c212a70 | 2015-09-02 17:36:22 +0100 | [diff] [blame] | 32 | fi |
Juan A. Suarez Romero | 99b4163 | 2017-04-05 20:14:22 +0200 | [diff] [blame] | 33 | # Or if it isn't in the ignore list. |
| 34 | if [ -f bin/.cherry-ignore ] ; then |
| 35 | if grep -q ^$candidate bin/.cherry-ignore ; then |
| 36 | continue |
| 37 | fi |
| 38 | fi |
Juan A. Suarez Romero | 3af7f82 | 2017-04-05 20:18:42 +0200 | [diff] [blame] | 39 | printf "Commit \"%s\" references %s\n" \ |
| 40 | "`git log -n1 --pretty=oneline $candidate`" \ |
| 41 | "$sha" |
Emil Velikov | c212a70 | 2015-09-02 17:36:22 +0100 | [diff] [blame] | 42 | done |
| 43 | done |
Emil Velikov | 71e00d6 | 2017-02-11 12:45:21 +0000 | [diff] [blame] | 44 | |
| 45 | rm -f already_picked |