diff options
| author | Emil Velikov <[email protected]> | 2018-11-08 15:05:18 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-11-15 15:55:40 +0000 |
| commit | b7418d1f3f102aeed8d3d38195f9b7d672216df0 (patch) | |
| tree | f93cf6f258b8fcb06e210ef5f520d646e3aa3745 /bin/get-pick-list.sh | |
| parent | 533fead4236459c3f04700ff130ffaee1503cb69 (diff) | |
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]>
Diffstat (limited to 'bin/get-pick-list.sh')
| -rwxr-xr-x | bin/get-pick-list.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 05dd3820e12..c456fdb3b81 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` |