A commit hook for the Gerrit code review servers inserts change
identifiers.  These identifiers are noise in the context of the
upstream kernel.  However, they are needed in most development
environments and the error needs to be ignored for static analysis
tools.

Signed-off-by: Dwane Pottratz <[email protected]>
---
 scripts/checkpatch.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2b3c228..0756935 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -21,6 +21,7 @@ use Getopt::Long qw(:config no_auto_abbrev);
 my $quiet = 0;
 my $tree = 1;
 my $chk_signoff = 1;
+my $chk_changeid = 1;
 my $chk_patch = 1;
 my $tst_only;
 my $emacs = 0;
@@ -64,6 +65,7 @@ Options:
   -q, --quiet                quiet
   --no-tree                  run without a kernel tree
   --no-signoff               do not check for 'Signed-off-by' line
+  --no-changeid              do not check for 'Change-Id' line
   --patch                    treat FILE as patchfile (default)
   --emacs                    emacs compile window format
   --terse                    one line per report
@@ -136,6 +138,7 @@ GetOptions(
        'q|quiet+'      => \$quiet,
        'tree!'         => \$tree,
        'signoff!'      => \$chk_signoff,
+       'changeid!'     => \$chk_changeid,
        'patch!'        => \$chk_patch,
        'emacs!'        => \$emacs,
        'terse!'        => \$terse,
@@ -2310,7 +2313,7 @@ sub process {
                }
 
 # Check for unwanted Gerrit info
-               if ($in_commit_log && $line =~ /^\s*change-id:/i) {
+               if ($in_commit_log && $line =~ /^\s*change-id:/i && 
$chk_changeid) {
                        ERROR("GERRIT_CHANGE_ID",
                              "Remove Gerrit Change-Id's before submitting 
upstream.\n" . $herecurr);
                }
-- 
1.9.1

Reply via email to