From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14D6BA0C42 for ; Sat, 12 Jun 2021 15:57:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03C49410FC; Sat, 12 Jun 2021 15:57:09 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2064.outbound.protection.outlook.com [40.107.96.64]) by mails.dpdk.org (Postfix) with ESMTP id E61AD40691; Sat, 12 Jun 2021 15:57:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UrEg1NoX/jzCEjQnkseKF/gvGZAHSPx93jcUmqsfLP2zOceoL+Nl/UU7idVVksZGtt6kg7VFsc5GLTQM9nNmqm+N+u1sd/NdCjLE8NQCRkW5TUXVuZJI9hI6g8aT9eo7LwFKBJL/g9Eiyq2lfanDnjEv123BQuhSb/xWDzSj23xnBzuVYpPyOTIugr/mJubN0q7VHuVrvhD+F+GaXRzi8oU0GfpqR8LZyXeWmyxezPk5fC4hVcw+aWCxqI/A+vg46+IuQ3pb3x/lfkwClTCmbDwV6crapLtkp5IIbZCCVyWvKZAym/x3Tz41OORUo4MOrFsMwOQVRp/nUsEf6BjKLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0umIcNeDeGKcroesHVAaHlRvFKj+gaeC+7kjwy9GQYw=; b=i2dm1yuLKASMteSFYAA6XpabIL7a1xrbYJmwbGxDZRI+IkgFlaSGI9X1lk/UUqPylVh5ufp1U0clpR1U7hpnUHySmpj1qD1i2gAeUwNgAoKFk9Ow6y/wU0OnnsANT6R2tUkZvhqM52eCkc6buxGIgTttWU3W38oEscrpMX6QLoKdsVAQHTQHb+sgRa4iZ6hOcDdXs8ImuOQp6xz9+UONhxXppEBNtH/IIApHmjwcVGgT8wKlJaxHiLAVHxx3TbzIkymy/6dmF1NaR+eTh5JKh7HLa1TJklhl1TJsxjSw4D85LRLms4UOS0d/PHpoXlsNzeaMo0UJzABT2K/tLs1Z3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0umIcNeDeGKcroesHVAaHlRvFKj+gaeC+7kjwy9GQYw=; b=VZ999Ee2Jlb7kp23qio1rH7i9Z8Vji3IqXyYSfSmWxQSoLG92ZXgdF83xHMhZ2YmQYAwl3uYIT9YfOaOvPktvOt2QJHR3/umdX/CAn+5A3Z8vTYDNCL1LPT/AiUna1p7eNjSp42AsZMfvJIUdQoN/GkG78Np5eZwMkXxNrVNM6Jt1gWkLOUdLyH3eKglJTcla8ZgK8zZwI3upSfGQW2H9HTDFKmmmscpASm3AEkBwWbjT0ecSvEBbkh9VAAQLogShjj/dmkQVWxqOdG9g6l2O/ywFa8Z1rtccP1clLeSIXc2GlmmZqpG5eh5izeoU7FCZcEZmLOQ+F0BvlYE6r80iQ== Received: from DM5PR15CA0048.namprd15.prod.outlook.com (2603:10b6:4:4b::34) by MWHPR12MB1134.namprd12.prod.outlook.com (2603:10b6:300:c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Sat, 12 Jun 2021 13:57:00 +0000 Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:4:4b:cafe::bb) by DM5PR15CA0048.outlook.office365.com (2603:10b6:4:4b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Sat, 12 Jun 2021 13:56:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Sat, 12 Jun 2021 13:56:59 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 12 Jun 2021 13:56:57 +0000 From: Xueming Li To: CC: Luca Boccassi , Christian Ehrhardt , Thomas Monjalon , , Yuanhan Liu Date: Sat, 12 Jun 2021 21:56:27 +0800 Message-ID: <20210612135628.20460-1-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3250b2d6-87e8-4a77-f67c-08d92da9f2e6 X-MS-TrafficTypeDiagnostic: MWHPR12MB1134: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:370; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j/AH4Npz9VC0kXY/BT9dslSqYQ7/VROVEeuiji2Ape7kSzvq7snPvFpqymj3Q+FdTEwNuFQbBmxI8vRtNoAg01s9Cj5EJc7ftbgzeFm5CnZxrZ4FYhrs8JZ/b0gP/juduBtbNEwqkiBB5xuv4VPiwZrh8AwGlKdm1t92OQDx/3BE1Ma2RPlPaNRgQMPqJhFQNV/HhSkIprRQdJqHb8KpqlbwmPpGcmXXUpNeNypMNrQ7nuDKdEDtujzb9d0l8Cv7LoAr/QDOX1fX9/l8SQU8N80F6CzlZlIb4HZnNrD6akKMmUVk71eKdtXS4/U5Qzsgg2Jy7Ua5cNjKh1J843hXoOy4p3aXBCIObhlHkr1D9Uxdw486puY2rK+WBatuhau/ChLe3qgcDu5pgOqjOIYMPLw2+/WZO1YCrzgfPaJMEMTfO82OOjM8Q+LbVqcoQueNU7nDysr5RA8ug/3vgGsaaTHLWK+AaWDukWXVhYwnu/dAxUOH4wpr6i0v0IrXZs6OEy//P1epjqgXk2pJERXBFIxIRX1t8xIMtZSYdkKvxh6FSACZR/jQQ1TEWYLlGyrlX9697ONOeQ+dmQXDGBARzYte0wgV0T0KIeEr0iaUBJadjbRtg5ss/q0FRhpuI3R8mj76Wc/edAoYiwj72vHXgA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(136003)(376002)(346002)(396003)(36840700001)(46966006)(82310400003)(7696005)(70586007)(336012)(70206006)(186003)(26005)(16526019)(426003)(4326008)(54906003)(1076003)(8936002)(6916009)(478600001)(6666004)(2906002)(7636003)(82740400003)(356005)(83380400001)(55016002)(36906005)(316002)(47076005)(8676002)(2616005)(5660300002)(36756003)(6286002)(36860700001)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2021 13:56:59.6492 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3250b2d6-87e8-4a77-f67c-08d92da9f2e6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1134 Subject: [dpdk-stable] [PATCH 1/2] devtools: fix version pattern for fix search X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" When scanning fixes from current(HEAD) branch, local tags were included and reported as version. For example: $ git tag --contains --merged 20.11_backport_202010506 // user tag v20.11 v20.11.1 This patch matches DPDK officail version pattern in search, selects the most early tag. Official tag pattern: "v." Fixes: 752d8e097ec1 ("scripts: show fixes with release version of bug") Cc: Thomas Monjalon Cc: stable@dpdk.org Signed-off-by: Xueming Li --- devtools/git-log-fixes.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 210c8dcf25..5fc57da913 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -38,12 +38,13 @@ range="$*" # get major release version of a commit commit_version () # { + local VER="v*.*" # use current branch as history reference local refbranch=$(git rev-parse --abbrev-ref HEAD) - local tag=$( (git tag -l --contains $1 --merged $refbranch 2>&- || + local tag=$( (git tag -l $VER --contains $1 --sort=creatordate --merged $refbranch 2>&- || # tag --merged option has been introduced in git 2.7.0 # below is a fallback in case of old git version - for t in $(git tag -l --contains $1) ; do + for t in $(git tag -l $VER --contains $1) ; do git branch $refbranch --contains $t | sed "s,.\+,$t," done) | -- 2.25.1