From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 98D083851C1B; Tue, 16 Mar 2021 10:53:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98D083851C1B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-7685] gcc-changelog: skip broken commit in git_update_version.py. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 82085eb3d44833bd1557fdd932c4738d987f559d X-Git-Newrev: 5f6a43d691c8f8c7ef1289aacfcbb14b7004de81 Message-Id: <20210316105323.98D083851C1B@sourceware.org> Date: Tue, 16 Mar 2021 10:53:23 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 10:53:23 -0000 https://gcc.gnu.org/g:5f6a43d691c8f8c7ef1289aacfcbb14b7004de81 commit r11-7685-g5f6a43d691c8f8c7ef1289aacfcbb14b7004de81 Author: Martin Liska Date: Tue Mar 16 09:35:32 2021 +0100 gcc-changelog: skip broken commit in git_update_version.py. contrib/ChangeLog: * gcc-changelog/git_update_version.py: Skip one problematic commit. Diff: --- contrib/gcc-changelog/git_update_version.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index d2cadb8811c..1e2b22b008b 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -26,6 +26,9 @@ from git_repository import parse_git_revisions current_timestamp = datetime.datetime.now().strftime('%Y%m%d\n') +# Skip the following commits, they cannot be correctly processed +IGNORED_COMMITS = ('c2be82058fb40f3ae891c68d185ff53e07f14f45') + def read_timestamp(path): with open(path) as f: @@ -98,6 +101,7 @@ def update_current_branch(): head = head.parents[1] commits = parse_git_revisions(args.git_path, '%s..%s' % (commit.hexsha, head.hexsha)) + commits = [c for c in commits if c.info.hexsha not in IGNORED_COMMITS] for git_commit in reversed(commits): prepend_to_changelog_files(repo, args.git_path, git_commit, not args.dry_mode)