diff mbox

[dpdk-dev] devtools: ignore non merged tags for backport

Message ID 20170731120738.1278-1-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Thomas Monjalon July 31, 2017, 12:07 p.m. UTC 
  When checking if a buggy commit was introduced in an old version,
the script compares last tag containing the bug and current version.
The non merged tags from non related branches must be ignored.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/git-log-fixes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Monjalon Aug. 3, 2017, 10 a.m. UTC | #1 
31/07/2017 14:07, Thomas Monjalon:
> When checking if a buggy commit was introduced in an old version,
> the script compares last tag containing the bug and current version.
> The non merged tags from non related branches must be ignored.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Applied
diff mbox

Patch

diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
index 740494677..580068741 100755
--- a/devtools/git-log-fixes.sh
+++ b/devtools/git-log-fixes.sh
@@ -66,7 +66,7 @@  range="$*"
 # get major release version of a commit
 commit_version () # <hash>
 {
-	tag=$(git tag -l --contains $1 | head -n1)
+	tag=$(git tag -l --contains $1 --merged | head -n1)
 	if [ -z "$tag" ] ; then
 		# before -rc1 tag of release in progress
 		make showversion | cut -d'.' -f-2