From cfd45066344610843ec32c1681d1690e158b2b0d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Tue, 11 Nov 2014 14:20:46 +0100
Subject: [PATCH] make bad-URL-regexp configurable
this is needed for the digia-internal sanity bot.
on the downside, local sanity checking won't complain about url abuse
anymore (unless the user configures it), but that seems somewhat minor
to me.
Change-Id: Ibbcd2b8ef79668d7f7c7c3a9aa6702c7599c4db1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
git-hooks/sanitize-commit | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index 6ec4c76..63e597b 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -102,7 +102,8 @@ my $iswip = defined($cfg{wip});
my $badrev = 0;
my $badsign = 0;
my $badid = defined($cfg{changeid});
-my $badurl = defined($cfg{url});
+my $badurl_rx = $config{badurl};
+my $badurl = !defined($badurl_rx) || defined($cfg{url});
my $badlog = defined($cfg{log});
my $spell_check = !defined($cfg{spell});
my $parents = 0;
@@ -286,7 +287,7 @@ while (<MSG>) {
if (!$badid && /\bI[0-9a-f]{40}\b/ && !/^Change-Id: /) {
complain_ln("Gerrit change id outside Change-Id footer", "changeid");
}
- if (!$badurl && /\bhttps?:\/\/(bugreports\.qt-project\.org\/browse\/|codereview\.qt-project\.org\/(\#change,|\#\/c\/)?\d+)/) {
+ if (!$badurl && /$badurl_rx/o) {
complain_ln("URL pointing to Gerrit or JIRA", "url");
}
my $ftr = 0;
--
GitLab