From patchwork Mon Apr 29 06:45:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 793019 Delivered-To: patch@linaro.org Received: by 2002:adf:cc13:0:b0:346:15ad:a2a with SMTP id x19csp1543529wrh; Sun, 28 Apr 2024 23:48:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUCSSsbZOsmOLOKqR7Nwzn1wbeNGQCmbYtuv8F9Bh8hUimuXYMqCmhy/IHRZprhu2WNqOAIBeMJJl7bxR3gW+nq X-Google-Smtp-Source: AGHT+IELMzCczmKlIM74Q0UYT7HpW8ieJzDsKO0Q8sSRnydHs3reZWGwPARhhd05yU1tAolKfY5w X-Received: by 2002:a05:620a:9358:b0:790:eac8:a6b4 with SMTP id sg24-20020a05620a935800b00790eac8a6b4mr4175231qkn.29.1714373299102; Sun, 28 Apr 2024 23:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714373299; cv=none; d=google.com; s=arc-20160816; b=n6Cck8L/xfYAMGbwodM7AcyEowHfGa9bHRNT7st/B17N2IAab3Qp8C4WD+cLudSrQ6 IwALxoT2coMgnjrIyMMSGParowxalHKW2NE5bxGlTALCOD+q1/m6kWtyGJOs21D3K7IO eimfl361px4XfEY9r+HFuLTSq+dXxrnGCr4wtdEIgN5rRTQTPxCsCUVxV5d41cOlshto g6BgEXXjuEtnVGIqwLcWJZ5yVBbrQy41CLojCkR9gF1MMuLef+4e9Ni8hcpMybhtatp1 kkihwRJ/o2uC7UARiFM/LnHeBBESd+kUvCNMXi+XDmUNSvVM8j5+oDyGpELDDJNSHxqw u7Pg== 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; bh=02DxvSddRMs34njfir5ceExhelWpjPRg1sgYR/gVHXk=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=GWaHPJhNLipwnEt8dGzT2AawtXM9NEUl7KQOyxPi8Z1tr/lHB8vaaqVlzKJKBsZG0e +wH44SApG7J+ClwChNuBweZoFpE96CU6tAxp482m9/Mq7/+JZ7S3stvoWLIkK8YPQQkM DAYIFVzY6OLbulwM/kVKKpr5tg5sXuRqT4h9mYGW7Q7i6kXlewfBYzaJmN9cGsMiR1e/ 7nXlpTD/VJic0erlPcfmaG/zRe+pxZGfNRRP1EzKqFPh74+0VEOXscBSslZxx/liz14V 4k/6csZ3jTVvLpxpDZbZyiLWwzFMc/1wtOzk85czQG2tFGIBZFcYDatdbpP4NWrdSpwD I0+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w7-20020a05620a0e8700b0078d6383f4bdsi24298772qkm.278.2024.04.28.23.48.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Apr 2024 23:48:19 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1KmI-00020P-QZ; Mon, 29 Apr 2024 02:46:20 -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 1s1Kls-0001rH-Sl; Mon, 29 Apr 2024 02:45:57 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1Klr-0006Xb-8P; Mon, 29 Apr 2024 02:45:52 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1F9A662CB4; Mon, 29 Apr 2024 09:45:40 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 2AABAC33F7; Mon, 29 Apr 2024 09:45:37 +0300 (MSK) Received: (nullmailer pid 238441 invoked by uid 1000); Mon, 29 Apr 2024 06:45:36 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 5/9] scripts/checkpatch: Do not use mailmap Date: Mon, 29 Apr 2024 09:45:32 +0300 Message-Id: <20240429064536.238392-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240429064536.238392-1-mjt@tls.msk.ru> References: <20240429064536.238392-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Philippe Mathieu-Daudé 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é Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- 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>) {