grep -Eo 'fixes:[a-f0-9]{8,40}'`
fixes_count=`echo "$fixes" | wc -l`
- if [ $fixes_count -eq 0 ] ; then
+ if test $fixes_count -eq 0; then
return 0
fi
- while [ $fixes_count -gt 0 ] ; do
+ while test $fixes_count -gt 0; do
# Treat only the current line
id=`echo "$fixes" | tail -n $fixes_count | head -n 1 | cut -d : -f 2`
fixes_count=$(($fixes_count-1))
# Bail out if we cannot find suitable id.
# Any specific validation the $id is valid and not some junk, is
# implied with the follow up code
- if [ "x$id" = x ] ; then
+ if test "x$id" = x; then
continue
fi
is_fixes_nomination()
{
is_sha_nomination "$1" "fixes:[[:space:]]*"
+ if test $? -eq 0; then
+ return 0
+ fi
+ is_sha_nomination "$1" "fixes[[:space:]]\+"
+}
+
+is_brokenby_nomination()
+{
+ is_sha_nomination "$1" "broken by"
+}
+
+is_revert_nomination()
+{
+ is_sha_nomination "$1" "This reverts commit "
}
# Use the last branchpoint as our limit for the search
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for potential candidates
-git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|fixes:' $latest_branchpoint..origin/master |\
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>\|This reverts commit' $latest_branchpoint..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
- if [ -f bin/.cherry-ignore ] ; then
+ if test -f bin/.cherry-ignore; then
if grep -q ^$sha bin/.cherry-ignore ; then
continue
fi
tag=typod
elif is_fixes_nomination "$sha"; then
tag=fixes
+ elif is_brokenby_nomination "$sha"; then
+ tag=brokenby
+ elif is_revert_nomination "$sha"; then
+ tag=revert
else
continue
fi