bin/get-fixes-pick-list.sh

   1 #!/bin/sh
   2
   3 # Script for generating a list of candidates [referenced by a Fixes tag] for
   4 # cherry-picking to a stable branch
   5 #
   6 # Usage examples:
   7 #
   8 # $ bin/get-fixes-pick-list.sh
   9 # $ bin/get-fixes-pick-list.sh > picklist
  10 # $ bin/get-fixes-pick-list.sh | tee picklist
  11
  12 # Use the last branchpoint as our limit for the search
  13 latest_branchpoint=`git merge-base origin/master HEAD`
  14
  15 # List all the commits between day 1 and the branch point...
  16 git log --reverse --pretty=%H $latest_branchpoint > already_landed
  17
  18 # ... and the ones cherry-picked.
  19 git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
  20         grep "cherry picked from commit" |\
  21         sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//'  > already_picked
  22
  23 # Grep for commits with Fixes tag
  24 git log --reverse --pretty=%H -i --grep="fixes:" $latest_branchpoint..origin/master |\
  25 while read sha
  26 do
  27         # Check to see whether the patch is on the ignore list ...
  28         if [ -f bin/.cherry-ignore ] ; then
  29                 if grep -q ^$sha bin/.cherry-ignore ; then
  30                         continue
  31                 fi
  32         fi
  33
  34         # For each one try to extract the tag
  35         fixes_count=`git show $sha | grep -i "fixes:" | wc -l`
  36         if [ "x$fixes_count" != x1 ] ; then
  37                 echo WARNING: Commit $sha has more than one Fixes tag
  38         fi
  39         fixes=`git show $sha | grep -i "fixes:" | head -n 1`
  40         # The following sed/cut combination is borrowed from GregKH
  41         id=`echo ${fixes} | sed -e 's/^[ \t]*//' | cut -f 2 -d ':' | sed -e 's/^[ \t]*//' | cut -f 1 -d ' '`
  42
  43         # Bail out if we cannot find suitable id.
  44         # Any specific validation the $id is valid and not some junk, is
  45         # implied with the follow up code
  46         if [ "x$id" = x ] ; then
  47                 continue
  48         fi
  49
  50         # Check if the offending commit is in branch.
  51
  52         # Be that cherry-picked ...
  53         # ... or landed before the branchpoint.
  54         if grep -q ^$id already_picked ||
  55            grep -q ^$id already_landed ; then
  56
  57                 # Finally nominate the fix if it hasn't landed yet.
  58                 if grep -q ^$sha already_picked ; then
  59                         continue
  60                 fi
  61
  62                 echo Commit $sha fixes $id
  63         fi
  64
  65 done
  66
  67 rm -f already_picked
  68 rm -f already_landed