Hi.
For an unknown reason the following commit modified ChangeLog file
together with other changes:
$ git show --stat c2be82058fb40f3ae891c68d185ff53e07f14f45
...
libstdc++-v3/ChangeLog | 9 +++++++++
libstdc++-v3/src/Makefile.am | 4 +++-
libstdc++-v3/src/Makefile.in | 3 ++-
Let's ignore the commit in git_update_version.py.
Martin
contrib/ChangeLog:
* gcc-changelog/git_update_version.py: Skip one problematic
commit.
---
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)
--
2.30.2