From nobody Wed Nov 5 14:26:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534871351927819.4611779251586; Tue, 21 Aug 2018 10:09:11 -0700 (PDT) Received: from localhost ([::1]:54964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA9S-0006g3-HG for importer@patchew.org; Tue, 21 Aug 2018 13:09:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA3x-0001Ap-9K for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA3n-0005er-M3 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:20 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA3m-0005S1-KG for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:15 -0400 Received: by mail-wr1-x443.google.com with SMTP id k5-v6so4942221wre.10 for ; Tue, 21 Aug 2018 10:03:10 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rwpaJal/i2vXDz8uWGShysx8gH+omaNHvK14ku3kyIo=; b=D7lBFf38EpA3Z4hFVzoptO2kaq2CQW9dw7zrhJSnp6rvC9sr3QeEKwyfj3SKtivvqF wkAf6DOv4R4kPPjdi/Ubp1Bm53es1XQCD4f0wbATrRkog+YDR/xjlmScmeDQzWERJenm rrlYo8/ZiHpisBT1I0k+nRZimY9J3USxIrjX1ZPG9Pr3R6S9onZJkZaLorfbNLajiymp pEezx96WIt4aiywOYI0q+GJKqYtVYybBJ2BzKhqM5yi8csCLS/V1CGKISn0I7QIWcOQv Rje1B/TNSLg77kuIYR0ZaJzwyrKFn5kGi32Hj9mVxEJlbrWOO07Cs5JYmEP76F4+TIbS nTZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=rwpaJal/i2vXDz8uWGShysx8gH+omaNHvK14ku3kyIo=; b=YoaCARCuYI76T2CMzNZF5BlEV+H4R3P3P/KWgj7dOip13t0dKWF+sO8C388Sjso4VN I6ZnppLNOirSNk8B0QJUXNXPHAzIt6QdKTv6AhsbU2X/QJV99SASvRNDrYs2aVnWmdWB XCjBxtdykTm+T37W8u/zHAtOn/qOvKoncAsuUAxnFPYjy5SMCEVaRb5ZtLBggQKYQZq+ SGvfTc2m7IijbisLG5AyVmaDqatmxEIOJeHLGugToePnkfYL72ADPpXEOGMleDu8UJLf kmrfNSawf2b6SYwZUj6Udf5TjYx6MYq30+m16AKCQ7nmL+cHuxX968wU5wUVQIQJej4h HaUg== X-Gm-Message-State: APzg51CaLIuxYQSWzenJFDq0hSk1Zen55+tWJfEj3CaA7IYrYdTzUEuv Yl11G09Ztl62Uw2FxTfhhL5FgIZN X-Google-Smtp-Source: ANB0VdaxDcf9jHbHNBGI2QIl99A7mw6QmDGO8U9Xa5OgNksEu7w26gYoCTqQ8wArMJqnV9QUKIseTA== X-Received: by 2002:adf:ab0b:: with SMTP id q11-v6mr9074297wrc.239.1534870988973; Tue, 21 Aug 2018 10:03:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:01:37 +0200 Message-Id: <1534870966-9287-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 05/74] checkpatch: fix filename detection when using -f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joe Perches , Andrew Morton , Linus Torvalds Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix $realfile filename when using -f/--file to not remove first level directory as if the filename was used in a -P1 patch. Only strip the first level directory (typically a or b) for P1 patches. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (extracted from Linux commit 2b7ab45395dc4d91ef30985f76d90a8f28f58c27) Signed-off-by: Paolo Bonzini --- scripts/checkpatch.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 42e1c50..0553634 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1367,10 +1367,10 @@ sub process { # extract the filename as it passes if ($line =3D~ /^diff --git.*?(\S+)$/) { $realfile =3D $1; - $realfile =3D~ s@^([^/]*)/@@; + $realfile =3D~ s@^([^/]*)/@@ if (!$file); } elsif ($line =3D~ /^\+\+\+\s+(\S+)/) { $realfile =3D $1; - $realfile =3D~ s@^([^/]*)/@@; + $realfile =3D~ s@^([^/]*)/@@ if (!$file); =20 $p1_prefix =3D $1; if (!$file && $tree && $p1_prefix ne '' && --=20 1.8.3.1