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: 16293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1912103wru; Mon, 7 Nov 2022 00:26:19 -0800 (PST) X-Google-Smtp-Source: AMsMyM5EoJS4DmcQoFmMxPT+zNH2AGQO8/NyRtlSSEDo8XZGjIQGdJpkNUBZKM/IMMrXFLNGkM8T X-Received: by 2002:a17:906:118a:b0:7ae:3a0b:c70a with SMTP id n10-20020a170906118a00b007ae3a0bc70amr14030681eja.259.1667809579388; Mon, 07 Nov 2022 00:26:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667809579; cv=none; d=google.com; s=arc-20160816; b=AMMw4NKB68WGqoNVu3OFid528Yo0l8VzxDovl6oa1AMrwQaS8zSFA9xU/t9LTtiMHR 1rHjzP2wAtL5XQAX9q5gwX9Z1uJ01SgS0GYT2hdksvL2xTrw4yGE0VLAFwiPdrI/3H/n NkGPt1QQnsZtXakevmLSw0rE002eLZmv27+W16Jcn1MGzTvo2xCxzaPeQmz0Ut7uzzI3 cySwBqh9VfITtQyWvvphTmX+THa9pKKYnBqnPhNpewZto5Ix8yXs3JxRe8yhPQ7nVxgq AZO7irYm/zlFEhB/aqL+asc9047tUoxqjC1wuTpE2eKfk3RTfaM+9LkoVvZQlDTj9vNu YKkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:cc:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=+KjFgV0VOk/4smKJvuvJP166OVVxB+xGQFrLR3hOcPk=; b=phJOamVCdmd+vVfj61nVm6RRTw0Xu0g/+6y0e0hy+OUXlyz5kNC6sMqz2qpXizgpEw QHQ+cewM9CWwvONCN6kWL98puWo2NtEYMtnI5L8HXtPJbg39QML47B98NBAhrOXg+6Ds lhgk5EwVjaKcGJde1xhg+poaLQyahp0j3kgHKTOSJtUVwLPKPdLA5u09y0ZdhFWzvfIA bg+GzhhwzlOjZRiOG06qmDTBJaGOWC19WIbw91NE0WQB8HuNkbaLsZ/HmD266FYSwC2v 8kzoX393fgNTsYhBhqTOLtSxnm8xn5Bw2e2BjViNeUdPBv4kj5Xp6DAEcpVCRKWWnaTw 2l0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Z4pynEwy; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o7-20020a056402038700b004573107a5basi7202039edv.352.2022.11.07.00.26.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:26:19 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Z4pynEwy; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 221483858D35 for ; Mon, 7 Nov 2022 08:26:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 221483858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667809578; 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=Z4pynEwyQJAubxhwiOL+kQZ9h/QPk4r64H6iJ538/m9tsQ8yfH+6csmAXRtMSR1+5 3Ng/wm975bIoL02zw7vbaRf/yadccotpzMFmlRlhRtUeqELzSqHso3rIljYOIwQdij 1VLEJQQjnOF8WVpq/Ofl8KG3PYaNAXzTpWGHWGsE= 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748825097569544400?= X-GMAIL-MSGID: =?utf-8?q?1748825097569544400?= 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,