From 09f9c1eefb8dffba779570da390bd7e8102ebcd5 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 18 Jun 2020 10:05:40 +0200 Subject: [PATCH] gcc-changelog: fix Backported from timestamp. contrib/ChangeLog: * gcc-changelog/git_commit.py: Fix Backported from timestamp when use_commit_ts=True is used. --- contrib/gcc-changelog/git_commit.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index ab9fdbd..4a78793 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -615,9 +615,13 @@ class GitCommit: timestamp = entry.datetime if self.cherry_pick_commit: timestamp = self.commit_to_date_hook(self.cherry_pick_commit) + # it can happen that it is a cherry-pick for a different + # repository if timestamp: timestamp = timestamp.strftime(DATE_FORMAT) - if not timestamp or use_commit_ts: + else: + timestamp = current_timestamp + elif not timestamp or use_commit_ts: timestamp = current_timestamp authors = entry.authors if entry.authors else [self.author] # add Co-Authored-By authors to all ChangeLog entries -- 2.7.4