Module: Mesa Branch: staging/18.3 Commit: 8b5ce5fa709ec70fa35b4b51f0d7a18a05898f7d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b5ce5fa709ec70fa35b4b51f0d7a18a05898f7d
Author: Emil Velikov <[email protected]> Date: Thu Nov 8 15:05:18 2018 +0000 bin/get-pick-list.sh: flesh out is_sha_nomination Refactor is_fixes_nomination into a is_sha_nomination helper. This way we can reuse it for more than the usual "Fixes:" tag. Cc: [email protected] Reviewed-by: Juan A. Suarez <[email protected]> Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit b7418d1f3f102aeed8d3d38195f9b7d672216df0) --- bin/get-pick-list.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 05dd3820e1..c456fdb3b8 100755 --- a/bin/get-pick-list.sh +++ b/bin/get-pick-list.sh @@ -21,10 +21,12 @@ is_typod_nomination() git show --summary "$1" | grep -q -i -o "CC:.*mesa-dev" } -is_fixes_nomination() +# Helper to handle various mistypos of the fixes tag. +# The tag string itself is passed as argument and normalised within. +is_sha_nomination() { fixes=`git show --pretty=medium -s $1 | tr -d "\n" | \ - sed -e 's/fixes:[[:space:]]*/\nfixes:/Ig' | \ + sed -e 's/'"$2"'/\nfixes:/Ig' | \ grep -Eo 'fixes:[a-f0-9]{8,40}'` fixes_count=`echo "$fixes" | wc -l` @@ -55,6 +57,11 @@ is_fixes_nomination() return 1 } +is_fixes_nomination() +{ + is_sha_nomination "$1" "fixes:[[:space:]]*" +} + # Use the last branchpoint as our limit for the search latest_branchpoint=`git merge-base origin/master HEAD` _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
