summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-08-30 17:37:59 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-09-04 07:26:02 +0000
commitddd8ad86da7790ce83640814ee5f1528c4df1fbe (patch)
treefb779c0b36213e6a3b0299228ca355acd5311413
parentf18687e44b0ea151ab65ac2dacbd752295fc1b03 (diff)
Add Fixes: tag to sanity bot
Change-Id: I80b9e149675a13810cfa1164d97b1902d1ceb792 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rwxr-xr-xgit-hooks/sanitize-commit5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index d7396af..4dd3f3c 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -471,6 +471,9 @@ while (<MSG>) {
} elsif (/^Task-number: *(.*)/i) {
complain_ln("Multiple tasks in one footer", "") if ($1 =~ /,/);
complain_ln("Capitalization of \"Task-number\" is wrong", "") if (!/^Task-number:/);
+ } elsif (/^Fixes: *(.*)/i) {
+ complain_ln("Multiple tasks in one footer", "") if ($1 =~ /,/);
+ complain_ln("Capitalization of \"Fixes\" is wrong", "") if (!/^Fixes:/);
}
my $ftr = 0;
if (/^\((?:partial(?:ly)? )?(?:cherry[- ]pick|(?:back-?)?port)(?:ed)?(?: from| of)?(?: commit)? (\w+\/)?([[:xdigit:]]{7,40})/) {
@@ -484,7 +487,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]+)*: /) {
$ftr = 1;
} elsif (/^(\[change-?log\]|change-?log: )/i && !defined($cfg{changelog})) {
$inchangelog = 1;