This error is wrong, the line is what exceeds LINE_LIMIT characters, the
limit doesn't exceed itself.

contrib/ChangeLog:

        * gcc-changelog/git_commit.py (GitCommit.parse_changelog): Fix
        * grammar.

OK for master?

commit ba4ddb1023844202f84a32275e451f9c7a0bb7b7
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Tue Jun 2 10:19:42 2020 +0100

    contrib: Improve error text for overlong ChangeLog lines
    
    This error is wrong, the line is what exceeds LINE_LIMIT characters, the
    limit doesn't exceed itself.
    
    contrib/ChangeLog:
    
            * gcc-changelog/git_commit.py (GitCommit.parse_changelog): Fix
            * grammar.

diff --git a/contrib/gcc-changelog/git_commit.py 
b/contrib/gcc-changelog/git_commit.py
index 4f82b58f64b..4f9c37cf0de 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -346,7 +346,7 @@ class GitCommit:
             if line != line.rstrip():
                 self.errors.append(Error('trailing whitespace', line))
             if len(line.replace('\t', ' ' * TAB_WIDTH)) > LINE_LIMIT:
-                self.errors.append(Error('line limit exceeds %d characters'
+                self.errors.append(Error('line exceeds %d character limit'
                                          % LINE_LIMIT, line))
             m = changelog_regex.match(line)
             if m:

Reply via email to