From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 93F2A3855014 for ; Wed, 7 Jul 2021 20:42:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 93F2A3855014 Received: by mail-wr1-x430.google.com with SMTP id d12so3973412wre.13 for ; Wed, 07 Jul 2021 13:42:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HOR6QTy5ZcgtuiD5CQrwvoEM9SgKH54wB59slk9NH7c=; b=o8hEkoEbde+9gP2tJQsNyXoMf3WlfZ4TCN6S+8bH8BoK9wjqSy0fKxoKyCgR9DpwX9 0VVnWqTc/RFjqKFrU0Z+q3vsU5Hggh0nfLHLbB4W22Px6m/pHwoEwq66SIF7gXdXacaL E55FubXge4Ua4mOsbg4jCVtiLXL+ez15N4wtSZRtPNfP1xW3Ql7H0TcW+I2oh0f/RAiM uvwwKRKQwTd/B0vTgu11dlY9j4TLn6ChQn6KL68FeI2N9QTkoULClL5U5JRS3JRcjV0Z BugrVGkp2k52M8MLhM3ahpzyTG0XtGKFThkWcoTAGKJo0wrUnTvQg7E2ln706PA0mXUC L3ZA== X-Gm-Message-State: AOAM532d1LX+F1HFFaVUy2+5q12s2Gpqy3O8PJUiC3dXtMDRLDgWcNVx hBZ5o7Ap+9bkb8g3oQooiYUOfvVKhrtp9Ysci5I= X-Google-Smtp-Source: ABdhPJzcis9ROx9JJdFTb9qrF1bRbnUGSwkgnmVnFa8lZTvyznZJd4H1xV7GJHuXIuOIbB+iVQC4J2thSuXC5cRkvDg= X-Received: by 2002:a5d:6986:: with SMTP id g6mr29358358wru.321.1625690573607; Wed, 07 Jul 2021 13:42:53 -0700 (PDT) MIME-Version: 1.0 References: <9121724e-e741-9bad-a39d-d6ac49422589@gmail.com> In-Reply-To: From: Jonathan Wakely Date: Wed, 7 Jul 2021 21:42:42 +0100 Message-ID: Subject: Re: where is PRnnnn required again? To: Martin Sebor Cc: Marek Polacek , gcc mailing list X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, HTML_MESSAGE, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: gcc@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jul 2021 20:42:56 -0000 On Wed, 7 Jul 2021, 17:39 Martin Sebor, wrote: > On 7/6/21 4:09 PM, Jonathan Wakely wrote: > > > > > > On Tue, 6 Jul 2021, 22:45 Martin Sebor via Gcc, > > wrote: > > > > 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 msebor@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 ...? > > > > > > > > Yes. With extra text the whole line is just treated as arbitrary text, > > not a "PR component/nnnn" string. So with the extra text it won't be > > added to the ChangeLog file, and won't match the PR in the subject line. > > > > I managed to push > > > > https://gcc.gnu.org/pipermail/gcc-cvs/2021-July/350316.html > > > > that uses the same style earlier today > > > > > > But will it add the PR numbers to the ChangeLog? I think the answer is > > no (in which case you could edit the ChangeLog tomorrow if you want them > > to be in there). > > It updated Bugzilla but it didn't add the PR numbers to the ChangeLog > entries. I still don't (obviously) understand the rules the hook uses > for what to update or the rationale for them. It seems as though > the PR in the subject is used to update only Bugzilla but not also > update the ChangeLogs (why not?) Because they are two completely separate processes. Verifying the commit message format is done by a git hook, and you can run exactly the same checks locally before pushing a commit. Updating bugzilla is done by a separate and different process, which has been in place for years (decades?) before we switched to git. The PR component/nnnn part that's > supposed to come before the ChangeLog is used to update ChangeLog > entries but seems to be ignored if it's followed by any text (why?) > See Jakub's reply. >