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.129.124]) by sourceware.org (Postfix) with ESMTPS id 662073858D33 for ; Fri, 20 Jan 2023 22:01:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 662073858D33 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=1674252087; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pLjwnE5psEHQPTyl5lNqC2QZkw1nRwIzZ+mxqvTlRtU=; b=fsLkigI/xfpq/Ro9kdOuu2iuUTJ8VE6gLRRDR224DqvI5ZvBeoQ4dv/xWXhcYnkGEInGMm /NY758tvRp9VwniWQXfIWiMAr0PfWEo4PfFaSmdAgnT5MP2u/YZ5FXCxX6WzjgvJLFXTKt WMQDxGxh3427CRAnoYq7xJVP5dxiNao= Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-97-7_EWp3r5O7ulwkWLBEiLAg-1; Fri, 20 Jan 2023 17:01:26 -0500 X-MC-Unique: 7_EWp3r5O7ulwkWLBEiLAg-1 Received: by mail-io1-f71.google.com with SMTP id 11-20020a5ea50b000000b00704d9039115so3693695iog.22 for ; Fri, 20 Jan 2023 14:01:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pLjwnE5psEHQPTyl5lNqC2QZkw1nRwIzZ+mxqvTlRtU=; b=SbWQN/YhLgUiUN9nQm4jzeN1b1Sg3KpJs/Ss0EncOVmvPvnZywf2KBIzDZFjhq+pvP XQgBrLiVUvoY7j1v5vY+5OHe3sjcz+sWPHySC8zd2AFT3Ai3xdfb2JII12B0IykNN+Du 0P5oRfUKlJhgMbC7+P69uuulRetP9/BqkpjWCKwtbFy5oFG48OhYucds6anebeVTaZak WJa/s2qWN8PcydyI8fIpjBsKFPTcA51XhV3lVy1F5vXgXch/LvlkFqbsvU+Ith3SgVfN dZ+koLO8KtNeGeOJuRIpdfMk/Wmmdd5ziTf9x/IBSOxmr4XnzvytO/r7304LppD8o/sa k/7A== X-Gm-Message-State: AFqh2kpnt1QB173MB41dQS2BmplTJY6geO1bI8C1+nT+bnHtMC4wJWct 3KmgKOk61ceb5KLkBfe20/RM+/ZawlNjBAxaZRrU/vuGNpQ1XAn812EL/RtzRxsdLmx/wxBNzx3 7wdZne0Akfmrs X-Received: by 2002:a92:d70e:0:b0:30d:aed2:20aa with SMTP id m14-20020a92d70e000000b0030daed220aamr11629530iln.29.1674252085633; Fri, 20 Jan 2023 14:01:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXsl/pvi9g6uY5tfwfZFUL8J+eUR2xDR3sZQAYnPkv6kaYYIJr3Uum4skSEoFcyBl5tT3DnYKw== X-Received: by 2002:a92:d70e:0:b0:30d:aed2:20aa with SMTP id m14-20020a92d70e000000b0030daed220aamr11629520iln.29.1674252085342; Fri, 20 Jan 2023 14:01:25 -0800 (PST) Received: from [192.168.0.241] (192-0-145-146.cpe.teksavvy.com. [192.0.145.146]) by smtp.gmail.com with ESMTPSA id t13-20020a92d14d000000b003039a19a927sm12273308ilg.7.2023.01.20.14.01.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Jan 2023 14:01:24 -0800 (PST) Message-ID: <62edb7c4-dad6-597e-8a4e-ab7a1708e622@redhat.com> Date: Fri, 20 Jan 2023 17:01:23 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: git out-of-order commit (was Re: [PATCH] Fortran: Remove unused declaration) To: Bernhard Reutner-Fischer , Jason Merrill , Harald Anlauf Cc: gfortran , gcc-patches List , Bernhard Reutner-Fischer , Carlos O'Donell References: <20221112210535.45202-1-aldot@gcc.gnu.org> <933d0150-32fd-84df-6a8a-a19f8c7d6dbc@gmx.de> <380C8F51-C0FA-4FD5-A0EE-19C460B92E50@gmail.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <380C8F51-C0FA-4FD5-A0EE-19C460B92E50@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,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 1/19/23 23:26, 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. > What shall we do now? I doubt a cherry-pick did this, we cherry pick often in glibc and the commit is added to the top of checkout and the commit date updated. There isn't anything we can do now. I was recently made aware that --since-as-filter= was added specifically to address this issue. https://patchwork.kernel.org/project/git/patch/YlnYDgZRzDI87b/z@vmiklos.hu/ ~~~ This is similar to --since, but it will filter out not matching commits, rather than stopping at the first not matching commit. This is useful if you e.g. want to list the commits from the last year, but one odd commit has a bad commit date and that would hide lots of earlier commits in that range. The behavior of --since is left unchanged, since it's valid to depend on its current behavior. Signed-off-by: Miklos Vajna ~~~ "but one odd commit has a bad commit date" :-) We should try to avoid commits like this because they really complicate any date-based analysis tooling, and --since-as-filter is fairly new. -- Cheers, Carlos.