bin/get-pick-list.sh: handle unofficial "broken by" tag
We have a number of cases were devs will use a tag "broken by". While it's not something officially documented or recommended, checking for it is trivial enough. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:

committed by
Emil Velikov

parent
209525aafb
commit
77ff0bfb5f
@@ -66,6 +66,11 @@ is_fixes_nomination()
|
|||||||
is_sha_nomination "$1" "fixes[[:space:]]\+"
|
is_sha_nomination "$1" "fixes[[:space:]]\+"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_brokenby_nomination()
|
||||||
|
{
|
||||||
|
is_sha_nomination "$1" "broken by"
|
||||||
|
}
|
||||||
|
|
||||||
# Use the last branchpoint as our limit for the search
|
# Use the last branchpoint as our limit for the search
|
||||||
latest_branchpoint=`git merge-base origin/master HEAD`
|
latest_branchpoint=`git merge-base origin/master HEAD`
|
||||||
|
|
||||||
@@ -78,7 +83,7 @@ git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_bra
|
|||||||
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
|
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
|
||||||
|
|
||||||
# Grep for potential candidates
|
# 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\>' $latest_branchpoint..origin/master |\
|
||||||
while read sha
|
while read sha
|
||||||
do
|
do
|
||||||
# Check to see whether the patch is on the ignore list.
|
# Check to see whether the patch is on the ignore list.
|
||||||
@@ -99,6 +104,8 @@ do
|
|||||||
tag=typod
|
tag=typod
|
||||||
elif is_fixes_nomination "$sha"; then
|
elif is_fixes_nomination "$sha"; then
|
||||||
tag=fixes
|
tag=fixes
|
||||||
|
elif is_brokenby_nomination "$sha"; then
|
||||||
|
tag=brokenby
|
||||||
else
|
else
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user