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 41059A0C47 for ; Wed, 16 Jun 2021 06:03:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36E76410DA; Wed, 16 Jun 2021 06:03:54 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2059.outbound.protection.outlook.com [40.107.95.59]) by mails.dpdk.org (Postfix) with ESMTP id 5EE0E4003C; Wed, 16 Jun 2021 06:03:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C0oRpbArVT2k35jrFqBjPlyYQXgh9UPL79rdic89Yfpv2tiUAp/SdU5zag0dYEEv+VbfzmIrdkR8BHVvBwQvZPkZzlWwt21ctEhkNCIEkOJmO3zPG8J2IeOBKqXNLnXlV7hZEGEzO8DgAbwZhkgJwdG7t9/o8kxIXPlMYjiTAWXGLxoGp0JJQ5TyTKxl1QGH3wNohUHYWl3A1JaFcTuntiiq5uhLQ/DLgA6f7qmjW78OflJf4phNAsjhxtOTvILaOoltYCvhIZupAFHWo1LSdH+QRbkc2/SDTC6uOAOTJpj0ZpcwzZElX1jcq97tweTPB9bc50qFYkTrMVJSL+VBAg== 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=CIjyPlrG2JpTuhOEHCl46joPjXGdiKFmICtOUogP+hc=; b=bzBw5rfuhnofDTq58uPMB5voGixAL85EdUZuCNhpXzVC1xNuzT4LywK49nFvhElXQ2yk9sOPItDv/ycslJ68d8EF3AME6UAmpklBVQub0JREsJS51703yaaXcuKtpeAGpkll2Ucm3HTh3iUPWYCwP/qLL1g7QrTNCz8nST7hHV/K0ZgNgNIebJfenAQeYPvkQjuI19sqIV4LkwSvS9dVNlqqv1GXJAYvdRbPe51kby7YFAfNKg1YN/wcJG7FRGKwvQIFSdB6BLJkQfND2wIDDIC3TzEcLN1AQ6ofbHWdkOXd51tIkNjtzF0AF7Oq1qsZ4cvOCT+dWAdZfJaKnHwWUA== 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=CIjyPlrG2JpTuhOEHCl46joPjXGdiKFmICtOUogP+hc=; b=QK0LObnN9hdmwbKG0A/b2tHPCHhDuuPejHsrYN1bmSOa7wFQOSBuL3qEoaQQ0hsnsxFKdAkmzMt6DQ/lE+PfUFdWIyxJRdzf3mWNic7s5AFVEys7fWucj2xueVj2IfvduUeSlL3m/Y7ArstEDp9ne9LV6liz6XELVy27ymz8HuTaJZLVup25PhCiP1AYoHN2CzHlPM/33qKXMXNhpsRp621UP1N89/6r3sX8AXDU+3yht7Sf3qhMqAurer+aXmiNtyVCENhRmocmzUUCnZjEOrH3PMz6itYjKJgzVvuKaeuE58maBPVStJW+vjS4SlKld5yd8I2cV21nVNI+7PlB3g== Received: from DS7PR03CA0152.namprd03.prod.outlook.com (2603:10b6:5:3b2::7) by BN6PR1201MB0209.namprd12.prod.outlook.com (2603:10b6:405:4d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15; Wed, 16 Jun 2021 04:03:46 +0000 Received: from DM6NAM11FT020.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b2:cafe::39) by DS7PR03CA0152.outlook.office365.com (2603:10b6:5:3b2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Wed, 16 Jun 2021 04:03:46 +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 DM6NAM11FT020.mail.protection.outlook.com (10.13.172.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4242.16 via Frontend Transport; Wed, 16 Jun 2021 04:03:46 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Jun 2021 04:03:43 +0000 From: Xueming Li To: Christian Ehrhardt , Luca Boccassi CC: , , Thomas Monjalon , , Yuanhan Liu Date: Wed, 16 Jun 2021 07:03:21 +0300 Message-ID: <20210616040324.311461-1-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210612135628.20460-1-xuemingl@nvidia.com> References: <20210612135628.20460-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] 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: 7303585d-d02d-4a39-9d5a-08d9307bbd27 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0209: 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: lcJaF8cEFuaP8w/qR0rI08jZAJqDMfZtDasY8WKgYXg/EIizCBoRinyTeUoDAIvS3YiAhzV7zos6Sa+aa13VNpSW5CSRY/h65byPZUGzIUHhlFMQC49JTzgQc7IDruuuozNZ/XXF6V4NVJK6vf9lYI5XdrKzfLLMNxM8q5gv+ihv9h99Y/H+fLF9PGLEIPkJRoM+e0NAMf+mGSKL0QetnccOfDQ1OpKeey1UMrEFWLCtFSMeLfUDy1uElYuf3xN33SjMAwS86wWFKmHaGBS7pKniReQhDZbujm00tCFo30VoMZGfYNR67I4OH3FEaj+tojmUOYhKtrwnAPNG28dIOP4sVUQdMLx9NDLqQ9NHknknfYfTveuNTrHfWJyZ4S0DRcLMDxunOTt4PJB3NRzF5Yr+06C/arnk3MX2WSRYq9aNBbdCZPFavr7sOt4Hp6lCLxamuUvNvJtNhGZ90h51utM8pzCbmjVVdR14OvWWt3CU6LATK9yymE7X3i5PD9E/Uro5jGMALO82yaYSqoTc7dMqbhDuIjHBOudJp0AKIMUsQfjGwaioctmh4c3DhvMnHQZvN5N+nYu3dl1bkWXnOGKW0h2WQmxpJuJYlhbwkq0j1pBDi7Tvqfbe907ypcJWtisuB0+C85h2qL63qaVEPA== 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)(136003)(376002)(396003)(346002)(39860400002)(46966006)(36840700001)(54906003)(316002)(70206006)(82740400003)(70586007)(47076005)(110136005)(82310400003)(36906005)(16526019)(55016002)(5660300002)(6286002)(36756003)(2906002)(4326008)(478600001)(83380400001)(8936002)(2616005)(86362001)(7636003)(426003)(6666004)(336012)(26005)(186003)(1076003)(36860700001)(356005)(7696005)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2021 04:03:46.1197 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7303585d-d02d-4a39-9d5a-08d9307bbd27 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: DM6NAM11FT020.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0209 Subject: [dpdk-stable] [PATCH v1 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 Reviewed-by: Christian Ehrhardt --- 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