From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id BEB933858401 for ; Fri, 20 Jan 2023 17:33:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BEB933858401 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674236028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=B4xKXwhbH+BHBwjpf1xaROFlejhQYoir5Eun7uBdmGk=; b=fnaaa8DLIVqWrBbH4zryP/iF70eH5e3gVOGvgi/xDSQAgsTTS8I8Y4NEKi+XI1bOamJdMT +9nqSqrs91Kt9G/ElemieO9BSMsZ3h1rdpsX9ChxdrozdBaz7IWwIARdVE8nPhFW7VDeJx L5nIRk1Z+LZKMOn+9T2vmcg1cTeQUXk= Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-564-jU9iQwT4Nsi4_DWZIvevHg-1; Fri, 20 Jan 2023 12:33:47 -0500 X-MC-Unique: jU9iQwT4Nsi4_DWZIvevHg-1 Received: by mail-il1-f200.google.com with SMTP id g11-20020a056e021a2b00b0030da3e7916fso4182266ile.18 for ; Fri, 20 Jan 2023 09:33:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=B4xKXwhbH+BHBwjpf1xaROFlejhQYoir5Eun7uBdmGk=; b=vDIL1/vMReQwGjHmeRNnIVPz6n7sSTkPr85dfvFLBd7sm+lIFKoZP3VNs/9ayPGy7K gTrtPiXx12LQXG1i+WKCkst9o7lz81zMjcBhCaxY1PSazeOHtSPUj/QRWscJOFCZBY9X tqOW35V24U+u1Cqgz413dQq/j9lb3AST46RAQ1DAwcr51++UpXxrV8vcA1zMEOndLQWa v+O/KMzBEFHGME64H2puXHxWwhyMGVlUy2wYZsNBOyXvfR4bkLl20GA1GCLS45AfY5Lx TbAvdBmLU4qAP31ZaPld0NsukAET7TIsA80cL5Tu+CxzrJyByzITeMWvBrhYk8lgEELN sOJA== X-Gm-Message-State: AFqh2kpd0RcFTNfqeuF/giOddfz5kwj3OKL/WMYiXhmja+DHsUQIaePr HeBUMQO9f64RxJWPphje59RAui0G4wLTLVTB8+9FTuJ+yOtlAomivFYC5t14JPbTEouPGwNT9E4 QfRzfPJthOcqOh43nMrZznNj7Q5fOhAKfpw== X-Received: by 2002:a02:ac96:0:b0:3a4:ab74:6924 with SMTP id x22-20020a02ac96000000b003a4ab746924mr1604348jan.303.1674236026558; Fri, 20 Jan 2023 09:33:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXs+/ij/brT0EJsNNIadBMTuWb+8D+PSLv4/WwGDEZ9bVI3ZPzwSPeM5reE3HCNWitIYgajhqj//NOnVc/PIAw0= X-Received: by 2002:a02:ac96:0:b0:3a4:ab74:6924 with SMTP id x22-20020a02ac96000000b003a4ab746924mr1604339jan.303.1674236026267; Fri, 20 Jan 2023 09:33:46 -0800 (PST) MIME-Version: 1.0 References: <20221112210535.45202-1-aldot@gcc.gnu.org> <933d0150-32fd-84df-6a8a-a19f8c7d6dbc@gmx.de> <380C8F51-C0FA-4FD5-A0EE-19C460B92E50@gmail.com> In-Reply-To: <380C8F51-C0FA-4FD5-A0EE-19C460B92E50@gmail.com> From: Jason Merrill Date: Fri, 20 Jan 2023 12:33:35 -0500 Message-ID: Subject: Re: git out-of-order commit (was Re: [PATCH] Fortran: Remove unused declaration) To: Bernhard Reutner-Fischer Cc: Harald Anlauf , gfortran , gcc-patches List , Bernhard Reutner-Fischer , "Carlos O'Donell" , =?UTF-8?Q?Martin_Li=C5=A1ka?= X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-17.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Jan 19, 2023 at 11:26 PM Bernhard Reutner-Fischer wrote: > > On 19 January 2023 20:39:08 CET, Jason Merrill wrote: > >On Sat, Nov 12, 2022 at 4:24 PM Harald Anlauf via Gcc-patches > > 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. You would have also needed to override the commit date with GIT_COMMITTER_DATE. Do you remember using that environment variable at all? > What shall we do now? I don't think there's anything we can do about this commit at this point; rewriting the git history would be a bigger disruption than leaving it alone. Martin, I wonder about having the hooks reject out-of-order CommitDate in future? Jason