On 07.09.23 11:38, Jakub Jelinek wrote:
On Thu, Sep 07, 2023 at 11:30:53AM +0200, Tobias Burnus wrote:
contrib/gcc-changelog: Check whether revert-commit exists
...
I think not should precede technically (or should we just drop technically)?
'technically' has been dropped (twice), based on the IRC discussion (in
the original commit and in a follow-up fixing commit as the re-commit
patch missed it).
Otherwise, the patch has been applied - but we did struggle with getting
it copied over to the right location on the server + getting it to work.
Last status: The check does work locally but did not for "git push"; in
principle, it should also work on the server but it failed when last
tested. While several directories on the server have now the new script,
it is unclear whether the (or all the) relevant one(s) have it and
whether the script itself is fine or not.
In any case, attached is the commit that rectifies the ChangeLog files
and also lists in the log-message part what the related commits did and
didn't do.
Committed as r14-3806-g478c37e7234530 - after the "Daily Bump", which
also required the same temporary work around as for the original issue.
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
München, HRB 106955
commit 478c37e72345307fad0aa06e0dae133eae206b0c
Author: Tobias Burnus <tob...@codesourcery.com>
Date: Fri Sep 8 12:02:02 2023 +0200
Update contrib + libgomp ChangeLogs for failed reject-commit testing
The following commit should have enabled checking for invalid revert hashes;
it worked locally - but did work as pre-commit hook on sourceware
as it wasn't copied to the hook directory:
r14-3777-gff20bce9f58 contrib/gcc-changelog: Check whether revert-commit exists
Hence, the following revert commit was wrongly applied:
r14-3778-gfbbd9001e9b Revert "contrib/gcc-changelog: Check whether revert-commit exists"
(In this commit: contrib/ChangeLog update for the revert.)
r14-3779-g69e83181ebc contrib/gcc-changelog: Check whether revert-commit exists
Re-applied the commit with a commit-log typo fixed but missing a late commit.
r14-3780-g1b0934b7276 Revert "contrib/gcc-changelog: Check whether revert-commit exists"
This commit still came through but re-instated the late wording fix in
contrib/gcc-changelog/git_commit.py.
(In this commit: contrib/ChangeLog update for the wording change.)
r14-3781-gd22cd7745ff Revert: "Another revert test with a bogus hash"
Another attempt to get a reject, but it still came through.
It removed tailing whitespace in libgomp/target.c
(In this commit: libgomp/ChangeLog was for the whitespace removal.)
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e49bbe30446..403a095512c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-07 Tobias Burnus <tob...@codesourcery.com>
+
+ * gcc-changelog/git_commit.py (GitCommit.__init__,
+ to_changelog_entries): Fix lost wording fix.
+
2023-09-07 Tobias Burnus <tob...@codesourcery.com>
* gcc-changelog/git_commit.py (GitCommit.__init__):
@@ -9,6 +14,20 @@
call super() with commit_to_info_hook=None instead
of a lambda function.
+2023-09-07 Tobias Burnus <tob...@codesourcery.com>
+
+ Revert:
+ 2023-09-07 Tobias Burnus <tob...@codesourcery.com>
+
+ * gcc-changelog/git_commit.py (GitCommit.__init__):
+ Handle commit_to_info_hook = None; otherwise, if None,
+ regard it as error.
+ (to_changelog_entries): Handle commit_to_info_hook = None;
+ if info is None, create a warning for it.
+ * gcc-changelog/git_email.py (GitEmail.__init__):
+ call super() with commit_to_info_hook=None instead
+ of a lamda function.
+
2023-09-07 Tobias Burnus <tob...@codesourcery.com>
* gcc-changelog/git_commit.py (GitCommit.__init__):
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index dbd5e4fc4ee..fb96155394e 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -5,6 +5,10 @@
omp_get_default_allocator.
(OMP_ALLOCATOR): Fix ICV var name; add see-also references.
+2023-09-07 Tobias Burnus <tob...@codesourcery.com>
+
+ * target.c (gomp_unload_device): Remove tailing whitespace.
+
2023-09-04 Tobias Burnus <tob...@codesourcery.com>
Thomas Schwinge <tho...@codesourcery.com>
