From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 2 Jun 2020 10:18:21 +0000 (+0100)
Subject: gcc-changelog: Improve error text for overlong ChangeLog lines
X-Git-Tag: basepoints/gcc-12~7437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fb93242cbf9b8bd8595472790303d1930e227d9;p=thirdparty%2Fgcc.git

gcc-changelog: 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 7fbc029408d0..b8c7f718c50a 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: