The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6d48eafa334f102009dbca9d191c6bbf52855551
commit 6d48eafa334f102009dbca9d191c6bbf52855551
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2025-01-21 20:47:29 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2025-01-21 22:02:56 +0000
checkstyle9.pl: don't require Signed-off-by for committers
Silence the warning about Signed-off-by: lines if the Author: is using a
FreeBSD.org address. We don't require the lines in direct FreeBSD
commits so the warning is just noise in this case.
Reviwed by: imp, emaste
Pull Request: https://github.com/freebsd/freebsd-src/pull/1577
---
tools/build/checkstyle9.pl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl
index 50ff1e9bd680..5854cf613e01 100755
--- a/tools/build/checkstyle9.pl
+++ b/tools/build/checkstyle9.pl
@@ -1254,6 +1254,7 @@ sub process {
my $in_header_lines = $file ? 0 : 1;
my $in_commit_log = 0; #Scanning lines before patch
my $has_sob = 0;
+ my $author_is_committer = 0;
my $non_utf8_charset = 0;
our @report = ();
@@ -1454,6 +1455,10 @@ sub process {
ERROR("Real email adress is needed\n" . $herecurr);
}
+ if ($line =~ /^Author: .*[a-z-0-9]\@freebsd\.org/i) {
+ $author_is_committer = 1
+ }
+
#check the patch for a signoff:
if ($line =~ /^\s*signed-off-by:/i) {
# This is a signoff, if ugly, so do not double report.
@@ -2654,7 +2659,7 @@ sub process {
}
- if ($has_sob == 0) {
+ if ($has_sob == 0 && $author_is_committer == 0) {
WARN("Missing Signed-off-by: line");
}
