From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id AC2C5A0C43
for <public@inbox.dpdk.org>; Wed, 11 Aug 2021 13:22:32 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9B510411E3;
Wed, 11 Aug 2021 13:22:32 +0200 (CEST)
Received: from NAM10-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam10on2052.outbound.protection.outlook.com [40.107.93.52])
by mails.dpdk.org (Postfix) with ESMTP id 0A96B40042;
Wed, 11 Aug 2021 13:22:30 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=jh+Q3zKZXCkr405Kg4S13djwWL3UwY19o3N8sT1ZBjfUSttWrD4roJ+6mJPFT6Q/tN3VqqrrRcVgFdXKXQNYW5fdBqfuMRZhcab6ABRvhMo61D+j4xCQZ32rSlx3nk2IZtj1fKvQxhXl0JfdA3McX/ztBW+ifduxl7YrBxp83eQbmvQsNUmfe20R9PfqdcLaSHtARpFEStMFqW5todJeEgyYbn5Q5mipDGFTLgd1RHiysF7lRcixKfe0718XA4SDJkl/262LbQ1KSYURYlKtMMSNwd/hfo5TGIlmq6vRvFPGkzTYUfIYCAqx3LqWaGGvQLYJFj71aOWmXd/xJMVlcA==
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=/Yn2MqWf9zZT//+YmqK9aEuCHy/9TFBKH8On2Akgoxg=;
b=I4H5H7c1kjLm7HNtdUi3AA3n6Rmrfmu44nhwu6w8xAWVWmI2bxscxhSx0qdcd6G5fjN4N/ZInArK/tu7iSFUkwSIqMuUolGkGWFSMg5SvkE8S0O7OeravFX0LTrYpzJvbaHwRxVekdb+VPZyGeZ1Qm2is0yRlT962UvqqKW5q4y6cYdY5v5tWrcPgS9MzT3RNuAk8iannpAPbtbz0rRRisjZmJ3E8LYBlbHJq9XKjMRi0snIYxCEOXyJyDlmy4g8zbLF4+vOz1SqU8VhEuQGtg0DdNKi/NMH0TC8xteZtqYQZyqgj0z0UuNYwrOFxZfFUERnKa+h2uLuWFaqbwy9DQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com;
dmarc=pass (p=quarantine 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=/Yn2MqWf9zZT//+YmqK9aEuCHy/9TFBKH8On2Akgoxg=;
b=gRa9lqySGbiYtZF5p7/7TFWz0k0QQvVbxNDIs+k9QrgVCgl5qLozP1ks0ld+gUal95Fs7PJAZiCGWF5MMHoSElWwzR1hXe1dibH7L6K5shELZVmvCRu0grq+riCKJwA3+NpABZL00RzvT99wxnImco8Y+73mEv/FAZR6554q//Nfsd9r1ylojpmLQsLExfwXnzFECNpkigmZZla2xFsT8dzTn46LC0VI1Pa6onaitIWzkIPjiSOFAgLR3m7YPiWyJGKUPtjmjZrHmLOsvENs9B4JG5W35lf/5ChwslW9upwRoayofDsAc+egEuFg2H0oNqzEoIaNuiA5GTLXpdaiQQ==
Received: from CO2PR05CA0073.namprd05.prod.outlook.com (2603:10b6:102:2::41)
by CY4PR12MB1559.namprd12.prod.outlook.com (2603:10b6:910:c::23) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.20; Wed, 11 Aug
2021 11:22:28 +0000
Received: from CO1NAM11FT063.eop-nam11.prod.protection.outlook.com
(2603:10b6:102:2:cafe::e9) by CO2PR05CA0073.outlook.office365.com
(2603:10b6:102:2::41) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.8 via Frontend
Transport; Wed, 11 Aug 2021 11:22:28 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed)
header.d=none;canonical.com; 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
CO1NAM11FT063.mail.protection.outlook.com (10.13.175.37) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 11:22:28 +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; Wed, 11 Aug
2021 11:22:25 +0000
From: Xueming Li <xuemingl@nvidia.com>
To:
CC: <dev@dpdk.org>, <xuemingl@nvidia.com>, Thomas Monjalon
<thomas@monjalon.net>, <stable@dpdk.org>, Christian Ehrhardt
<christian.ehrhardt@canonical.com>, Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Wed, 11 Aug 2021 14:22:05 +0300
Message-ID: <20210811112207.370348-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.5]
X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 8146151c-6c26-4d35-8d71-08d95cba4d82
X-MS-TrafficTypeDiagnostic: CY4PR12MB1559:
X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr
X-Microsoft-Antispam-PRVS: <CY4PR12MB1559AABB58C8BA72FC3AF704A1F89@CY4PR12MB1559.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:370;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Xz9qkN9Kusu0UaCU0aoy9nv/kWY00MShfuVJptB+R5ONBwk3Unz01vg6Q81Dr2TbDf0mNPGwNq3JL/ddiOJ1Ok4Fiv1Ukfp6kJZthXElgs1EqeanzfeDhap/ScDNvgm3jh2dXQmFKGGC1CfDkI362RWu6EGgoFJEVL97UaCMJsHBA8U5K9QVO41cVanU157S/W7UB7wqjX/5OnUWYwzdN3XePCQASDjqFvdSpxOrkgnT7nW4ndtZG3cW9aONFQZtpua0yHF2+XTpa25ApxWUmNd/Nx8wDo5ZVg1Wu6B2PjajN4B/CVoa38W4ZVuPv4N10XymC9Lb8juk7lnYvZrZ9bH3jAoTu2IzOZ6lCkVCK5rxL5OrhUeZxb1xuqDQdIMCy3hgaFSdKEMKX5Uw+rt4Znl1kDE8rO/xtRf7Qm0+5DMmWG+nsaOev+668r8IqB002jlCl5CNgkEM4Gbln6N5yheDlnPIqIXfzopKnGgWKQuPfitOr+twpg5bNjTKKHLnWGsO3PH6fmdJM5XAGL0ZCGSFgLgCkMMfeP9VuPiaXKd7ZVrKyzLRtaheGFVVFQ2MF8iweBF7AXJsyKbnAxafyr/2MK0GwjNU4vS9ql766YFFxN0d9DuxKSCbqW9bHjOILLRFCZ4oGbd6Qz13PFrLHO7zH8GdKDa9+3ojG2b4ikhhvCg8tB5LyxOLDvEAvn9GdEbRP7ygiyJ3e+kdeKvVo1O8k6XJ1fS7ocm7GpTO78M=
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)(396003)(346002)(376002)(136003)(46966006)(36840700001)(8936002)(2616005)(426003)(54906003)(82310400003)(86362001)(316002)(2906002)(336012)(36906005)(4326008)(36756003)(6666004)(7696005)(55016002)(47076005)(82740400003)(186003)(7636003)(16526019)(70586007)(478600001)(70206006)(83380400001)(1076003)(6286002)(109986005)(356005)(36860700001)(5660300002)(8676002)(26005)(266003);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 11:22:28.2590 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 8146151c-6c26-4d35-8d71-08d95cba4d82
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: CO1NAM11FT063.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1559
Subject: [dpdk-stable] [PATCH v3 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
When scanning fixes from current(HEAD) branch, local tags were included
and reported as version. For example:
$ git tag --contains <commit_id> --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<major>.<minor>"
Fixes: 752d8e097ec1 ("scripts: show fixes with release version of bug")
Cc: Thomas Monjalon <thomas@monjalon.net>
Cc: stable@dpdk.org
Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
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..153ba5b438 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 () # <hash>
{
+ 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