X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=devtools%2Fgit-log-fixes.sh;h=cd5cf8939fe07320bd47d152271ebfe8cec55c6a;hb=224374cc0e3ca44af5141fb7035a97f338d00c18;hp=740494677f372b0c3cb2a41077780e1b9115f73a;hpb=f051679dc577d93d177e6eddefaba28a69d9955f;p=dpdk.git

diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
index 740494677f..cd5cf8939f 100755
--- a/devtools/git-log-fixes.sh
+++ b/devtools/git-log-fixes.sh
@@ -66,7 +66,16 @@ range="$*"
 # get major release version of a commit
 commit_version () # <hash>
 {
-	tag=$(git tag -l --contains $1 | head -n1)
+	# use current branch as history reference
+	local refbranch=$(git rev-parse --abbrev-ref HEAD)
+	local tag=$( (git tag -l --contains $1 --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
+			git branch $refbranch --contains $t |
+			sed "s,.\+,$t,"
+		done) |
+		head -n1)
 	if [ -z "$tag" ] ; then
 		# before -rc1 tag of release in progress
 		make showversion | cut -d'.' -f-2