public inbox for fortran@gcc.gnu.org
 help / color / mirror / Atom feed
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
To: Jason Merrill <jason@redhat.com>, Harald Anlauf <anlauf@gmx.de>
Cc: gfortran <fortran@gcc.gnu.org>,
	gcc-patches List <gcc-patches@gcc.gnu.org>,
	Bernhard Reutner-Fischer <aldot@gcc.gnu.org>,
	Carlos O'Donell <codonell@redhat.com>
Subject: Re: git out-of-order commit (was Re: [PATCH] Fortran: Remove unused declaration)
Date: Fri, 20 Jan 2023 05:26:27 +0100	[thread overview]
Message-ID: <380C8F51-C0FA-4FD5-A0EE-19C460B92E50@gmail.com> (raw)
In-Reply-To: <CADzB+2ntKbkyfqx3BhVZDC49BQUCpc6gJ4b8GLw_mvpD5+zmRw@mail.gmail.com>

On 19 January 2023 20:39:08 CET, Jason Merrill <jason@redhat.com> wrote:
>On Sat, Nov 12, 2022 at 4:24 PM Harald Anlauf via Gcc-patches
><gcc-patches@gcc.gnu.org> wrote:
>>
>> Am 12.11.22 um 22:05 schrieb Bernhard Reutner-Fischer via Gcc-patches:
>> > This function definition was removed years ago, remove it's prototype.
>> >
>> > gcc/fortran/ChangeLog:
>> >
>> >       * gfortran.h (gfc_check_include): Remove declaration.
>> > ---
>> >   gcc/fortran/gfortran.h | 1 -
>> >   1 file changed, 1 deletion(-)
>> > ---
>> > Regtests cleanly, ok for trunk?
>> >
>> > diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
>> > index c4deec0d5b8..ce3ad61bb52 100644
>> > --- a/gcc/fortran/gfortran.h
>> > +++ b/gcc/fortran/gfortran.h
>> > @@ -3208,7 +3208,6 @@ int gfc_at_eof (void);
>> >   int gfc_at_bol (void);
>> >   int gfc_at_eol (void);
>> >   void gfc_advance_line (void);
>> > -int gfc_check_include (void);
>> >   int gfc_define_undef_line (void);
>> >
>> >   int gfc_wide_is_printable (gfc_char_t);
>>
>> OK, thanks.
>
>Somehow this was applied with a CommitDate in 2021, breaking scripts
>that assume monotonically increasing CommitDate.  Anyone know how that
>could have happened?

Sorry for that.
I think i cherry-picked this commit to master before pushing it, not 100% sure though.
What shall we do now?

  parent reply	other threads:[~2023-01-20  4:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-12 21:05 [PATCH] Fortran: Remove unused declaration Bernhard Reutner-Fischer
2022-11-12 21:23 ` Harald Anlauf
2023-01-19 19:39   ` git out-of-order commit (was Re: [PATCH] Fortran: Remove unused declaration) Jason Merrill
2023-01-19 20:20     ` Harald Anlauf
2023-01-20  4:26     ` Bernhard Reutner-Fischer [this message]
2023-01-20 17:33       ` Jason Merrill
2023-01-23 10:37         ` Martin Liška
2023-01-20 22:01       ` Carlos O'Donell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=380C8F51-C0FA-4FD5-A0EE-19C460B92E50@gmail.com \
    --to=rep.dot.nop@gmail.com \
    --cc=aldot@gcc.gnu.org \
    --cc=anlauf@gmx.de \
    --cc=codonell@redhat.com \
    --cc=fortran@gcc.gnu.org \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=jason@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).