From patchwork Tue Apr 2 11:59:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 785114 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp4892115wrt; Tue, 2 Apr 2024 05:02:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVDxPthLu/XVuYNNf/1x8kOobwa+xJ13Jl47l6c20x6sdqTqQoOttIPoJ0rnB6op4HGXEa360/cl03uPoouRv8N X-Google-Smtp-Source: AGHT+IFIQovMlyV9LweQe8gJsjt4jGnpZODJYAY5zyrY4RaXiK7loP9C8Zw1bwNh28EBYi+QvxND X-Received: by 2002:a05:622a:181d:b0:432:e94b:9359 with SMTP id t29-20020a05622a181d00b00432e94b9359mr9620161qtc.27.1712059352994; Tue, 02 Apr 2024 05:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712059352; cv=none; d=google.com; s=arc-20160816; b=SfMc8g7UGmW8SXFcWAVyoImz/ht8ak8cb6YhHwDcxJ1mKm7smlALnyLcpbv0QdaOmk 0WhbVq5J1D4poDSgK6sP7oyttL1UYTj7BjmdE3I8l91j39SsEIcc5OIzJyMVxVTZj3HF zd1ycjl53U6cwlHWXUXp/pUxrJ18TizjVcrL43vCwqUyo+4xnYEgo6rZMiNSe04Tpm4y hYT1InkmRLLVIY4iJtKmiBpHY6RAJxNz2tDid3AiECsa0leSXhgRppc8QZBQ2MY19K10 kTyVvfdLrgEOg2NI6fPrNP2dxp9vsQE7xDucVEuaHShGsOIR2lY0baYcHP9EXiAROhw/ hLrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XLtSFJIR+pdlVJvy9cvj3GhXFmD3XkdoFwgLyOSTVnw=; fh=fb7IhllOj7js+szEK+kmR+7CvhR4IYMVv7io2suprP4=; b=afMN4pbXLoCmSmpMb9wPuBOY5WsI4dfl5onSkEtqgiYSEWjyM2lEAOPgBiVumn2TAr ltc3gHTHWYcHMUAC1JzMqrzvIkAmSXFgA6QdWxCl1gNxi4S60BPVpAxUkSLlIFcy0roE jY9s4CdgpaxrtA/H94J1lspslZULuSjwkrHD5sn5lCQfWiifWHysK+35hVUnAdXbNX8U DyZsnsSXMQbhsfh1QbiGxK37koGTbNzLyb/ZzAOLfxXrxpSWgbfgCCbZOTwTkU90YOZA n9RnYm5vsV47JSbN5HjYTYd5P3nzV0GrR4v7eoVOr021oXNmhd7tryIA4Asj8+MmC8yc GBzA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AZAvNpTe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b9-20020a05622a020900b004343c254d7bsi404851qtx.605.2024.04.02.05.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2024 05:02:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AZAvNpTe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrcq9-0008Og-8o; Tue, 02 Apr 2024 08:02:09 -0400 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 1rrcpK-0007dp-6m for qemu-devel@nongnu.org; Tue, 02 Apr 2024 08:01:19 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrcoL-0003O7-VV for qemu-devel@nongnu.org; Tue, 02 Apr 2024 08:01:16 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-41551639550so22453605e9.2 for ; Tue, 02 Apr 2024 05:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712059215; x=1712664015; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XLtSFJIR+pdlVJvy9cvj3GhXFmD3XkdoFwgLyOSTVnw=; b=AZAvNpTe2jtmJ2Ayuu52EzK37dnF2svpTnT6M4s6/eDtaoWfTQNKp218Pr2lkF/7YG KcVSi35JSMBsMGYIkoD92LK+GpViqjbXee4J0hpJAUSiTe0oBg+RyupTwAlxabnSHJe6 hAPpPx0sOq3o1czziVOFkigGT9xWjfR6gbS73KKiNwcXs9pQfOldeug4a+MXKsJdqwb8 YJMvh0wwC1+vkFLrf6jZcnAYf17Cx36lCESskpET7Cvd8I8XC5gInWLmO/BH3CzgwiJX +IyWmmYnGUiKW52cehUfPVNcyYnsodVpO2eYXhxAGNDwSVVLcy2Dl4OmYP6yrnTV/VX8 7Edg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712059215; x=1712664015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XLtSFJIR+pdlVJvy9cvj3GhXFmD3XkdoFwgLyOSTVnw=; b=J48YbcMdZqEj9CI9uZrbnXuASO3nb/6e0Sd0ZdTBfiW2y+l8tW5c4ufgXoPWAQwmf5 CMK/dJYfu+FrdiAk+hnhnR/3nS8x70qEnWpjdLpXZoSwwtHUthYuQj73pne5M7M2Cw91 sU5V2aWNkepmbTNLJMAMiwg/2qn7W+CCBHn5A7wUFcLzoaJyyIct+69nqyiFCWslJbZR DLuIaz8uCXhILDbJxyiwHXDi5A7bw1VeOpiI9iJs0jh914tUXqHqOgqaAmw6Wbf82WXs v1wG0U07t+i+fcmqwSRnp6s+6SlUsRhbVknsd0HCkFrWy6PI7sOZa0MMcG98DSIcHaU3 tytA== X-Gm-Message-State: AOJu0Yz4mxW2QCms0wXjtkUPFh6pPOkc0IFaR/UaO2HlIK0Bp6h9Iauc neWous28dTATMmpyz0RSY2haMcj8WX+s3DX+g/V33xP9bXD1Vj5AALZLUAEHX2SIMoRYTR9967Y tpQg= X-Received: by 2002:a05:600c:a47:b0:414:cbd:1ee2 with SMTP id c7-20020a05600c0a4700b004140cbd1ee2mr9128870wmq.35.1712059215639; Tue, 02 Apr 2024 05:00:15 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id w7-20020a05600c474700b004156ca1df95sm3946167wmo.18.2024.04.02.05.00.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 05:00:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , qemu-trivial@nongnu.org, Michael Tokarev , Peter Maydell , Stefan Weil , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] scripts/checkpatch: Do not use mailmap Date: Tue, 2 Apr 2024 13:59:58 +0200 Message-ID: <20240402115958.67615-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402115958.67615-1-philmd@linaro.org> References: <20240402115958.67615-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The .mailmap file fixes mistake we already did. Do not use it when running checkpatch.pl, otherwise we might commit the very same mistakes. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- scripts/checkpatch.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 12e9028b10..76a0b79266 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -435,8 +435,8 @@ if ($chk_branch) { my @patches; my %git_commits = (); my $HASH; - open($HASH, "-|", "git", "log", "--reverse", "--no-merges", "--format=%H %s", $ARGV[0]) || - die "$P: git log --reverse --no-merges --format='%H %s' $ARGV[0] failed - $!\n"; + open($HASH, "-|", "git", "log", "--reverse", "--no-merges", "--no-mailmap", "--format=%H %s", $ARGV[0]) || + die "$P: git log --reverse --no-merges --no-mailmap --format='%H %s' $ARGV[0] failed - $!\n"; for my $line (<$HASH>) { $line =~ /^([0-9a-fA-F]{40,40}) (.*)$/; @@ -460,7 +460,7 @@ if ($chk_branch) { "-c", "diff.renamelimit=0", "-c", "diff.renames=True", "-c", "diff.algorithm=histogram", - "show", + "show", "--no-mailmap", "--patch-with-stat", $hash) || die "$P: git show $hash - $!\n"; while (<$FILE>) {