On Thu, Oct 31, 2024 at 04:05:25PM -0400, James K. Lowden wrote:
> On Tue, 29 Oct 2024 18:52:01 +0100
> Jakub Jelinek <ja...@redhat.com> wrote:
>
> > > This 1st patch includes a stub cobol/ChangeLog, if that helps.
> >
> > It needs to go into a separate commit (i.e. register the new ChangeLog
> > locations in one commit, let gccadmins update the ~gccadmin copy of
> > it, then commit a patch which only adds ChangeLog files and nothing
> > else, and only after it commit the rest
>
> AIUI I am asked to split my initial patch into three,
>
> 1. create gcc/cobol directory ("register the new ChangeLog locations")
> 2. create gcc/cobol/ChangeLog file
> 3. the remainder of the former "metafile patch", #1 of 5
You are asked for 3 separate patches, but different ones.
If only gcc/cobol directory is being added and not toplevel libgcobol, then
the first patch should be like
https://gcc.gnu.org/r13-4588
or
https://gcc.gnu.org/r13-4589
adding support to contrib/gcc-changelog/git_commit.py
This commit should have a ChangeLog entry in the commit message, see
the above two commits for how they should look like.
The second (which can only be committed when the first one is manually
picked by one of gccadmins) should be just adding the ChangeLog.
This shouldn't have a ChangeLog entry in the commit message, see
e.g.
https://gcc.gnu.org/r13-4591
for an idea how to word the commit message.
ChangeLog updates don't need a ChangeLog entry.
> I don't know how to produce a patch that only creates a directory. git afaik
> does not recognize empty directories as repository elements. OTOH, a patch
> that adds gcc/cobo/ChangeLog creates gcc/cobol automatically.
>
> In the spirit of cooperation, here is one patch that adds the ChangeLog.
>
> --jkl
>
> [snip]
> >From ccb8a64c97461d792fdc39db249980a9ecb63b4bpre.patch 4 Oct 2024 12:01:22
> >-0400
> From: "James K. Lowden" <jklow...@symas.com>
> Date: Fri 01 Nov 2024 01:50:33 PM EDT
> Subject: [PATCH] Add 'cobol' to 1 file
>
> gcc/ChangeLog
> * cobol/ChangeLog: Add ChangeLog for COBOL FE
>
> ---
> gcc/cobol/ChangeLog | ++++++
> 1 file changed, 6 insertions(+), 1 deletion(-)
> diff --git a/gcc/cobol/ChangeLog b/gcc/cobol/ChangeLog
> new file mode 100644
> index 00000000000..2988f44a1f1
> --- /dev/null
> +++ b/gcc/cobol/ChangeLog
> @@ -0,0 +1,6 @@
> +^L
> +Copyright (C) 2022 Free Software Foundation, Inc.
Surely this should be 2024.
Jakub
