<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6408">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make_version: Use only annotated tags to determine version<br><br>They have timestamps so if there's more than 1 tag pointing to a<br>commit, we always get the latest.<br><br>Change-Id: I411e38cebae5eded77fdd320ca622205499b18ad<br>---<br>M build_tools/make_version<br>1 file changed, 4 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/build_tools/make_version b/build_tools/make_version<br>index f351871..e0427bf 100755<br>--- a/build_tools/make_version<br>+++ b/build_tools/make_version<br>@@ -27,10 +27,12 @@<br>     git update-index --refresh >/dev/null 2>&1 || :<br> <br>     MODIFIED=""<br>-    VERSION=`${GIT} describe --tags --dirty 2> /dev/null`<br>+    ${GIT} config --local --replace-all versionsort.prereleaseSuffix -rc<br>+    <br>+    VERSION=`${GIT} describe --dirty 2> /dev/null`<br>     if [ $? -eq 0 ]; then<br>         if [ "${VERSION:(-6)}" = "-dirty" ]; then<br>-            VERSION=`${GIT} describe --tags --long --dirty=M 2> /dev/null`<br>+            VERSION=`${GIT} describe --long --dirty=M 2> /dev/null`<br>             VERSION="GIT-${VERSION}"<br>         elif [ -z "`${GIT} tag --contains HEAD`" ]; then<br>             VERSION="GIT-${VERSION}"<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6408">change 6408</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/6408"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: repotools </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I411e38cebae5eded77fdd320ca622205499b18ad </div>
<div style="display:none"> Gerrit-Change-Number: 6408 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>