diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-05-07 21:40:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-05-08 12:38:17 +0000 |
| commit | cd793f89a15478ed8ec5c0bbd9d1ca45440a9f84 (patch) | |
| tree | f3bd674811358bde9a90e3ba4dc8d096524ca081 /git-hooks | |
| parent | a1b4bba07dfdb9fd65ac74feeec9babc502cb60e (diff) | |
| download | qtrepotools-cd793f89a15478ed8ec5c0bbd9d1ca45440a9f84.tar.gz | |
make the footer identification regex stricter again
don't accept single words, as this leads to way too many false
positives, as originally anticipated. instead, whitelist "Fixes"
explicitly.
amends ddd8ad86.
Fixes: QTQAINFRA-2789
Change-Id: Iec23c24e942e0947b53162ab066f53394cabb851
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'git-hooks')
| -rwxr-xr-x | git-hooks/sanitize-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index bdfbd1d..4a3f5fc 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -479,7 +479,7 @@ while (<MSG>) { $badsign = 0; # cherry-pick lines count as footers as well. $ftr = 1; - } elsif (/^[A-Z][A-Za-z]+(-[A-Za-z][a-z]+)*: /) { + } elsif (/^(?:[A-Z][A-Za-z]+(?:-[A-Za-z][a-z]+)+|F[Ii][Xx][Ee][Ss]): /) { $ftr = 1; } elsif (/^(\[change-?log\]|change-?log: )/i && !defined($cfg{changelog})) { $inchangelog = 1; |