From: Xueming Li <xuemingl@nvidia.com>
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>,
Luca Boccassi <bluca@debian.org>
Cc: <dev@dpdk.org>, <xuemingl@nvidia.com>,
Thomas Monjalon <thomas@monjalon.net>, <stable@dpdk.org>,
Yuanhan Liu <yuanhan.liu@linux.intel.com>
Subject: [dpdk-dev] [PATCH v1 1/2] devtools: fix version pattern for fix search
Date: Wed, 16 Jun 2021 07:03:21 +0300 [thread overview]
Message-ID: <20210616040324.311461-1-xuemingl@nvidia.com> (raw)
In-Reply-To: <20210612135628.20460-1-xuemingl@nvidia.com>
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..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 () # <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
next prev parent reply other threads:[~2021-06-16 4:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 13:56 [dpdk-dev] [PATCH " Xueming Li
2021-06-12 13:56 ` [dpdk-dev] [PATCH 2/2] devtools: auto detect branch to search fix patches Xueming Li
2021-06-14 14:15 ` Christian Ehrhardt
2021-06-15 10:56 ` Xueming(Steven) Li
2021-06-30 6:46 ` Xueming(Steven) Li
2021-06-14 13:56 ` [dpdk-dev] [PATCH 1/2] devtools: fix version pattern for fix search Christian Ehrhardt
2021-06-16 4:03 ` Xueming Li [this message]
2021-06-30 6:34 ` [dpdk-dev] [PATCH v2 " Xueming Li
2021-06-30 6:34 ` [dpdk-dev] [PATCH v2 2/2] devtools: fix patches missing if range newer than HEAD Xueming Li
2021-08-08 11:24 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2021-08-09 7:44 ` Xueming(Steven) Li
2021-08-08 11:14 ` [dpdk-dev] [dpdk-stable] [PATCH v2 1/2] devtools: fix version pattern for fix search Thomas Monjalon
2021-08-09 3:32 ` Xueming(Steven) Li
2021-06-16 4:03 ` [dpdk-dev] [PATCH v1 2/2] devtools: auto detect branch to search fix patches Xueming Li
2021-08-11 11:22 ` [dpdk-dev] [PATCH v3 1/2] devtools: fix version pattern for fix search Xueming Li
2021-08-11 11:22 ` [dpdk-dev] [PATCH v3 2/2] devtools: fix patches missing if range newer than HEAD Xueming Li
2022-11-26 21:44 ` [dpdk-stable] " Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616040324.311461-1-xuemingl@nvidia.com \
--to=xuemingl@nvidia.com \
--cc=bluca@debian.org \
--cc=christian.ehrhardt@canonical.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
--cc=yuanhan.liu@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).