public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-3780] Revert "contrib/gcc-changelog: Check whether revert-commit exists"
@ 2023-09-07 11:05 Tobias Burnus
  0 siblings, 0 replies; only message in thread
From: Tobias Burnus @ 2023-09-07 11:05 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:1b0934b7276cc24e20c25dc22aa08268f4b00444

commit r14-3780-g1b0934b7276cc24e20c25dc22aa08268f4b00444
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Thu Sep 7 13:00:55 2023 +0200

    Revert "contrib/gcc-changelog: Check whether revert-commit exists"
    
    This reverts commit ffffffffffffffffffffffffffffffffffffffff.
    
    This checks whether the pre-commit hook of the mentioned commit
    triggers and rejects this commit due to the bogus commit hash.
    
    This commit actually does not revert that patch but fixes that
    patch as 'technically' was accidently re-added in the second
    commit.

Diff:
---
 contrib/gcc-changelog/git_commit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 4f1bd4d72930..9110317a759a 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -331,7 +331,7 @@ class GitCommit:
         if self.revert_commit:
             # The following happens for get_email.py:
             if not self.commit_to_info_hook:
-                self.warnings.append(f"Invoked script can technically not obtain info about "
+                self.warnings.append(f"Invoked script can not obtain info about "
                                      f"reverted commits such as '{self.revert_commit}'")
                 return
             self.info = self.commit_to_info_hook(self.revert_commit)
@@ -810,7 +810,7 @@ class GitCommit:
                     if self.commit_to_info_hook:
                         self.warnings.append(f"Cherry-picked commit not found: '{self.cherry_pick_commit}'")
                     else:
-                        self.warnings.append(f"Invoked script can technically not obtain info about "
+                        self.warnings.append(f"Invoked script can not obtain info about "
                                              f"cherry-picked commits such as '{self.revert_commit}'")
                     timestamp = current_timestamp
             elif not timestamp or use_commit_ts:

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-09-07 11:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-07 11:05 [gcc r14-3780] Revert "contrib/gcc-changelog: Check whether revert-commit exists" Tobias Burnus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).