From nobody Mon Sep 16 19:25:08 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675085773; cv=none; d=zohomail.com; s=zohoarc; b=Vmph4/+V6v1IZNaaApW1O9A6Mpe8LBiDVcukWiGXxQBHvVAk0b8o2MOUJd8kofIBkZ7ZAeK6M3NklL9TtS86lU+PhAZZ5ekq0idrnNmC+aQMO0COUIkyDVrLbDtcimxb/JU7yooJmdQRSpTTqjOW+W0MdD2afPLQNLRJa3F9byA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675085773; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qcRImc2dDs0fev9FIlKyp+kjuB8jSu/a15QT63yaRK8=; b=npFXr5p4CHdh0HH0fWyEkYgBp3FB1TameHFVQnneTuv+oAB7ubB3sNMwGA6eGQ3Q9nZRCbEPlXVueUfYJn78P1oO5WmukTBb0+0v/ra9SKrriQYofb4MIJAucOBoRncXmVPtvJs1BjntxlMuoeNFJIVk87vN+IwLHImKsPvEXFw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675085773235220.1736643605642; Mon, 30 Jan 2023 05:36:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMU7g-0005xG-Qy; Mon, 30 Jan 2023 08:23:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMU6u-0004KI-E2 for qemu-devel@nongnu.org; Mon, 30 Jan 2023 08:22:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMU6m-0005ha-Pd for qemu-devel@nongnu.org; Mon, 30 Jan 2023 08:22:12 -0500 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-663-LUrub_A-MRCrkV-xrq18mg-1; Mon, 30 Jan 2023 08:21:58 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74DE5183B3C3; Mon, 30 Jan 2023 13:21:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4AC912026D76; Mon, 30 Jan 2023 13:21:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3FC4B21E6A20; Mon, 30 Jan 2023 14:21:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675084921; 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=qcRImc2dDs0fev9FIlKyp+kjuB8jSu/a15QT63yaRK8=; b=cDB0pom8wO5GvfHaJWN3sVhAAsvoePPW30GTiQJMjXzuAP6u8U5ei4mW/UK8uOphVRdO3V fuF+G1kT8pkTAtWPODvwblZR1ldcZfHbhqhrAtTdvI67OKWvSm0QBm6FvIMeyGWfrmvVLg B8j1Lqz7sl64V/6o/iA824jdGfkN8c4= X-MC-Unique: LUrub_A-MRCrkV-xrq18mg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, pbonzini@redhat.com, kwolf@redhat.com, hreitz@redhat.com, imp@bsdimp.com, kevans@freebsd.org, berrange@redhat.com, groug@kaod.org, qemu_oss@crudebyte.com, mst@redhat.com, philmd@linaro.org, peter.maydell@linaro.org, alistair@alistair23.me, jasowang@redhat.com, jonathan.cameron@huawei.com, kbastian@mail.uni-paderborn.de, quintela@redhat.com, dgilbert@redhat.com, michael.roth@amd.com, kkostiuk@redhat.com, tsimpson@quicinc.com, palmer@dabbelt.com, bin.meng@windriver.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, Eric Blake Subject: [PATCH v5 01/20] scripts/clean-includes: Fully skip / ignore files Date: Mon, 30 Jan 2023 14:21:37 +0100 Message-Id: <20230130132156.1868019-2-armbru@redhat.com> In-Reply-To: <20230130132156.1868019-1-armbru@redhat.com> References: <20230130132156.1868019-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675085774694100001 Content-Type: text/plain; charset="utf-8" When clean-includes claims to skip or ignore a file, only the part that sanitizes use of qemu/osdep.h skips the file. The part that looks for duplicate #include does not, and neither does committing to Git. The latter can get unrelated stuff included in the commit, but only if you run clean-includes in a dirty tree, which is unwise. Messed up when we added skipping in commit fd3e39a40c "scripts/clean-includes: Enhance to handle header files". The former can cause bogus reports for --check-dup-head. Added in commit d66253e46a "scripts/clean-includes: added duplicate #include check", duplicating the prior mistake. Fix the script to fully skip files. Fixes: fd3e39a40ca2 ("scripts/clean-includes: Enhance to handle header file= s") Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include chec= k") Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake --- scripts/clean-includes | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index d37bd4f692..86944f27fc 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -111,6 +111,7 @@ cat >"$COCCIFILE" < 1) print $0}' if [ $? -eq 0 ]; then echo "Found duplicate header file includes. Please check the above= files manually." @@ -184,7 +186,7 @@ if [ "$DUPHEAD" =3D "yes" ]; then fi =20 if [ "$GIT" =3D "yes" ]; then - git add -- "$@" + git add -- $files git commit --signoff -F - <