gcc-changelog: ignore one more revision

Message ID dadf1eb8-2ef1-631f-fa6e-630372c2566a@suse.cz
State New
Headers
Series gcc-changelog: ignore one more revision |

Commit Message

Martin Liška April 4, 2022, 7:38 a.m. UTC
  Ignore:

Checking 86d8e0c0652ef5236a460b75c25e4f7093cc0651: FAILED
ERR: line should start with a tab: "This reverts commits r12-7804 and r12-7929."
ERR: could not deduce ChangeLog file

It seems Jason pushed the revision to origin/trunk where the checking script is not run.

@Jakub: Can you please re-run Daily bump script?

Thanks,
Martin

contrib/ChangeLog:

	* gcc-changelog/git_update_version.py: Ignore the revision.
---
  contrib/gcc-changelog/git_update_version.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
  

Comments

Joseph Myers April 4, 2022, 8:07 p.m. UTC | #1
On Mon, 4 Apr 2022, Martin Liška wrote:

> Ignore:
> 
> Checking 86d8e0c0652ef5236a460b75c25e4f7093cc0651: FAILED
> ERR: line should start with a tab: "This reverts commits r12-7804 and
> r12-7929."
> ERR: could not deduce ChangeLog file
> 
> It seems Jason pushed the revision to origin/trunk where the checking script
> is not run.

I thought I'd fixed that (last August) by making the hooks-bin scripts 
handle master and trunk the same.
  
Martin Liška April 6, 2022, 7:12 a.m. UTC | #2
On 4/4/22 22:07, Joseph Myers wrote:
> On Mon, 4 Apr 2022, Martin Liška wrote:
> 
>> Ignore:
>>
>> Checking 86d8e0c0652ef5236a460b75c25e4f7093cc0651: FAILED
>> ERR: line should start with a tab: "This reverts commits r12-7804 and
>> r12-7929."
>> ERR: could not deduce ChangeLog file
>>
>> It seems Jason pushed the revision to origin/trunk where the checking script
>> is not run.
> 
> I thought I'd fixed that (last August) by making the hooks-bin scripts
> handle master and trunk the same.

Well, I can't prove it, it's just a guess. Maybe Jason can answer the question?
Note the server hook should have rejected the revision.

Cheers,
Martin
  

Patch

diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 8cd337d5434..2de96882943 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -31,7 +31,8 @@  IGNORED_COMMITS = (
          'c2be82058fb40f3ae891c68d185ff53e07f14f45',
          '04a040d907a83af54e0a98bdba5bfabc0ef4f700',
          '2e96b5f14e4025691b57d2301d71aa6092ed44bc',
-        '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4')
+        '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4',
+        '86d8e0c0652ef5236a460b75c25e4f7093cc0651')
  
  
  def read_timestamp(path):