On 7/6/21 3:36 PM, Marek Polacek wrote:
On Tue, Jul 06, 2021 at 03:20:26PM -0600, Martin Sebor via Gcc wrote:
I came away from the recent discussion of ChangeLogs requirements
with the impression that the PRnnnn bit should be in the subject
(first) line and also above the ChangeLog part but doesn't need
to be repeated again in the ChangeLog entries.  But my commit
below was rejected last Friday with the subsequent error.  Adding
PR middle-end/98871 to the ChangeLog entry let me push the change:

https://gcc.gnu.org/g:6feb628a706e86eb3f303aff388c74bdb29e7381

I just had the same error happen now, again with what seems like
a valid commit message.  Did I misunderstand something or has
something changed recently?

Martin

commit 8a6d08bb49c2b9585c2a2adbb3121f6d9347b780 (HEAD -> master)
Author: Martin Sebor <mse...@redhat.com>
Date:   Fri Jul 2 16:16:31 2021 -0600

     Improve warning suppression for inlined functions [PR98512].

     Resolves:
     PR middle-end/98871 - Cannot silence -Wmaybe-uninitialized at
declaration si
te
     PR middle-end/98512 - #pragma GCC diagnostic ignored ineffective in
conjunct
ion with alias attribute

This should be just

        PR middle-end/98871
        PR middle-end/98512

, no?

Does it matter if there's text after the PR ...?  I managed to push

  https://gcc.gnu.org/pipermail/gcc-cvs/2021-July/350316.html

that uses the same style earlier today but the one below failed just
a little while later.  Copying the PR tree-optimization/86650 part
into the ChangeLog entry fixed it (I didn't think to try without
the PR summary).

Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 16 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 1008 bytes | 1008.00 KiB/s, done.
Total 6 (delta 4), reused 0 (delta 0)
remote: *** The following commit was rejected by your hooks.commit-extra-checker script (status: 1)
remote: *** commit: e8c83cb3d4824f85588d162e7aa58c25f8cb926b
remote: *** ChangeLog format failed:
remote: *** ERR: PR 86650 in subject but not in changelog: "Add test for [PR86650]."
remote: ***
remote: *** Please see: https://gcc.gnu.org/codingconventions.html#ChangeLogs
remote: ***
remote: error: hook declined to update refs/heads/master
To git+ssh://gcc.gnu.org/git/gcc.git
 ! [remote rejected]         master -> master (hook declined)
error: failed to push some refs to 'git+ssh://mse...@gcc.gnu.org/git/gcc.git'
tmp$ (cd /src/gcc/master/ && git show 151b423a82f..e8c83cb3d48)
commit e8c83cb3d4824f85588d162e7aa58c25f8cb926b (HEAD -> master)
Author: Martin Sebor <mse...@redhat.com>
Date:   Tue Jul 6 15:15:53 2021 -0600

    Add test for [PR86650].

    PR tree-optimization/86650 - -Warray-bounds missing inlining context

    gcc/testsuite/ChangeLog:
            * gcc.dg/Warray-bounds-76.c: New test.

diff --git a/gcc/testsuite/gcc.dg/Warray-bounds-76.c b/gcc/testsuite/gcc.dg/Warray-bounds-76.c
...

Martin

 Either here, or...

     gcc/ChangeLog:

...here.
             * diagnostic.c (get_any_inlining_info): New.
             (update_effective_level_from_pragmas): Handle inlining context.
             (diagnostic_enabled): Same.
             (diagnostic_report_diagnostic): Same.
             * diagnostic.h (struct diagnostic_info): Add ctor.
             (struct diagnostic_context): Add new member.
             * tree-diagnostic.c (set_inlining_locations): New.
             (tree_diagnostics_defaults): Set new callback pointer.



Enumerating objects: 11, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 16 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 3.37 KiB | 3.37 MiB/s, done.
Total 6 (delta 5), reused 0 (delta 0)
remote: *** The following commit was rejected by your
hooks.commit-extra-checker script (status: 1)
remote: *** commit: 8a6d08bb49c2b9585c2a2adbb3121f6d9347b780
remote: *** ChangeLog format failed:
remote: *** ERR: PR 98512 in subject but not in changelog: "Improve warning
suppression for inlined functions [PR98512]."
remote: ***
remote: *** Please see:
https://gcc.gnu.org/codingconventions.html#ChangeLogs
remote: ***
remote: error: hook declined to update refs/heads/master
To git+ssh://gcc.gnu.org/git/gcc.git
  ! [remote rejected]         master -> master (hook declined)
error: failed to push some refs to
'git+ssh://mse...@gcc.gnu.org/git/gcc.git'


Marek


Reply via email to