summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2017-08-08 19:10:27 +0200
committerJesus Fernandez <Jesus.Fernandez@qt.io>2017-08-08 19:41:15 +0000
commitf9427cec15cdcfd37c13fc883fd17d16f23bdcfb (patch)
tree0c8124362c4e0f6521d127ab849c90c0fe3a6423
parent6d98fbe0f35d2d525541c532d9a758f46681fc19 (diff)
fix copyright check
The variable $no_copyright was getting an incorrect value due to a typo in the regular expression. Change-Id: Ia99bb32f0c9c2bba3fff50662059ff03ab6cf556 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rwxr-xr-xgit-hooks/sanitize-commit4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index a90aabf..606338a 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -1,5 +1,5 @@
#! /usr/bin/perl
-# Copyright (C) 2015 The Qt Company Ltd.
+# Copyright (C) 2017 The Qt Company Ltd.
# Copyright (C) 2014 Petroules Corporation.
# Contact: http://www.qt.io/licensing/
#
@@ -853,7 +853,7 @@ while (<DIFF>) {
}
$size = 0;
$new_file = 1;
- $no_copyright = $issrc && $file !~ /\.(qdocconf|json)$|/i && $file !~ /(^|\/)3rdparty\//;
+ $no_copyright = $issrc && $file !~ /\.(qdocconf|json)$/i && $file !~ /(^|\/)3rdparty\//;
} elsif ($size > 20000 && !$issrc && !defined($cfg{size})) {
my $old_size = 0;
for my $old_tree (split(/,/, $old_trees)) {