From patchwork Mon Nov 7 08:25:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1700451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=x7ArVwDQ; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N5PSj32ZTz23lT for ; Mon, 7 Nov 2022 19:25:56 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 65E8A3858C2D for ; Mon, 7 Nov 2022 08:25:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65E8A3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667809552; bh=+KjFgV0VOk/4smKJvuvJP166OVVxB+xGQFrLR3hOcPk=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=x7ArVwDQBL7TsmvjwM7tnjwajISpzcVoWMUjNA7ZGEV2SvUTcDY7VQz7B0/XzKfX9 Pj8In9w6arD8pFQW6nmcFDa8dRXustsT1ob4hW3IVSzOFB1TUjghOwj7wRpaqYfb1+ 9U1L/kNIoOboLrmdBCv9ZoFjTe4F16QFCHNt1+vE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 282C43858415 for ; Mon, 7 Nov 2022 08:25:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 282C43858415 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-199--FE1UD7NOReB70LDi7xeoQ-1; Mon, 07 Nov 2022 03:25:15 -0500 X-MC-Unique: -FE1UD7NOReB70LDi7xeoQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B834101A54E; Mon, 7 Nov 2022 08:25:15 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.193.252]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E622D1121314; Mon, 7 Nov 2022 08:25:14 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 2A78PCaU368249 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 7 Nov 2022 09:25:12 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2A78PAY8368248; Mon, 7 Nov 2022 09:25:10 +0100 Date: Mon, 7 Nov 2022 09:25:10 +0100 To: gcc-patches@gcc.gnu.org Cc: Martin =?utf-8?b?TGnFoWth?= , Thomas Schwinge Subject: [committed] Add another commit to ignore Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_LOTSOFHASH, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi! We can't handle r13-3652-ge4cba49413ca429dc82f6aa2e88129ecb3fdd943 because that commit removed whole liboffloadmic including its ChangeLog (I'm surprised that touching ChangeLog worked out together with removing the files), but gcc-changelog/git_update_version.py then choked on it because it couldn't add the liboffloadmic entries. Wonder if next time such removals shouldn't be committed in 2 steps, in one step everything but the ChangeLog would be removed, wait for update_git_version and then in a separate commit just remove the ChangeLog. Anyway, to restore daily bumps I had to commit the following patch, run update_git_version manually and then commit in r13-3705-g89d0a14a1fdf89d38d9db1156ffde8c1b276823c the ChangeLog entries for the removal manually. 2022-11-06 Jakub Jelinek * gcc-changelog/git_update_version.py: Add e4cba49413ca429dc82f6aa2e88129ecb3fdd943 to ignored commits. Jakub --- contrib/gcc-changelog/git_update_version.py.jj +++ contrib/gcc-changelog/git_update_version.py @@ -33,7 +33,8 @@ IGNORED_COMMITS = ( '04a040d907a83af54e0a98bdba5bfabc0ef4f700', '2e96b5f14e4025691b57d2301d71aa6092ed44bc', '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4', - '86d8e0c0652ef5236a460b75c25e4f7093cc0651') + '86d8e0c0652ef5236a460b75c25e4f7093cc0651', + 'e4cba49413ca429dc82f6aa2e88129ecb3fdd943') FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT,