From: Michael Marchetti <mmarchetti@sandvine.com>
Date: Fri, 23 Feb 2018 19:29:14 +0000 (+0100)
Subject: Update changelog generation for release tag
X-Git-Tag: v3.0.3~6
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=a3f638ca7670587565a7cf00f02db651c3e29f5a

Update changelog generation for release tag

Signed-off-by: Michael Marchetti <mmarchetti@sandvine.com>
---

diff --git a/tools/generatechangelog-pipeline.sh b/tools/generatechangelog-pipeline.sh
index c527c549..e2fa55e4 100755
--- a/tools/generatechangelog-pipeline.sh
+++ b/tools/generatechangelog-pipeline.sh
@@ -2,8 +2,17 @@
 
 REPO_NAME=$(basename $(git config --get remote.origin.url) | cut -d'.' -f1)
 # get the latest tag
-TAG_END="HEAD"
 TAG_START=$(git tag | sort -Vr | head -1)
+
+head_tag_diff=$(git rev-list $TAG_START ^HEAD |wc -l)
+if  [ $head_tag_diff -eq 0 ]; then
+    # HEAD and latest tag intersect. Instead try and find a previous tag and use that as the start diff
+    TAG_END=$TAG_START
+    TAG_START=$(git tag | sort -Vr | head -2 | sort -V | head -1)
+else
+    TAG_END="HEAD"
+fi
+
 git pull --tags origin master &> /dev/null
 echo "<h1>$REPO_NAME Changelog</h1>"
 echo "<h2>tag: ${TAG_START} -> ${TAG_END}</h2>"