diff options
| -rwxr-xr-x | bin/get-fixes-pick-list.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/bin/get-fixes-pick-list.sh b/bin/get-fixes-pick-list.sh index cf95f283771..81b78adc9c9 100755 --- a/bin/get-fixes-pick-list.sh +++ b/bin/get-fixes-pick-list.sh @@ -31,10 +31,16 @@ do fi fi + # Skip if it has been already cherry-picked. + if grep -q ^$sha already_picked ; then + continue + fi + # For each one try to extract the tag fixes_count=`git show $sha | grep -i "fixes:" | wc -l` + warn=`(test $fixes_count -gt 1 && echo $fixes_count) || echo 0` while [ $fixes_count -gt 0 ] ; do - fixes=`git show $sha | grep -i "fixes:" | tail -n $fixes_count | head -n 1` + fixes=`git show $sha | grep -i "fixes:" | tail -n $fixes_count` fixes_count=$(($fixes_count-1)) # The following sed/cut combination is borrowed from GregKH id=`echo ${fixes} | sed -e 's/^[ \t]*//' | cut -f 2 -d ':' | sed -e 's/^[ \t]*//' | cut -f 1 -d ' '` @@ -53,19 +59,19 @@ do if grep -q ^$id already_picked || grep -q ^$id already_landed ; then - # Finally nominate the fix if it hasn't landed yet. - if grep -q ^$sha already_picked ; then - continue - fi - printf "Commit \"%s\" fixes %s\n" \ "`git log -n1 --pretty=oneline $sha`" \ "$id" - fixes_count=0 + warn=$(($warn-1)) fi done + if [ $warn -gt 0 ] ; then + printf "WARNING: Commit \"%s\" has more than one Fixes tag\n" \ + "`git log -n1 --pretty=oneline $sha`" + fi + done rm -f already_picked |