<p>George Joseph would like Joshua Colp to <strong>review</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6437">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "make_version: Use only annotated tags to determine version"<br><br>This reverts commit 697ffe8f1d91d0d1bbac5def4703beb914117166.<br><br>Change-Id: I32b7e6c1e3463a917ab6532c2c3fc95c8de505c9<br>---<br>M build_tools/make_version<br>1 file changed, 2 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/37/6437/1</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 e0427bf..f351871 100755<br>--- a/build_tools/make_version<br>+++ b/build_tools/make_version<br>@@ -27,12 +27,10 @@<br>     git update-index --refresh >/dev/null 2>&1 || :<br> <br>     MODIFIED=""<br>-    ${GIT} config --local --replace-all versionsort.prereleaseSuffix -rc<br>-    <br>-    VERSION=`${GIT} describe --dirty 2> /dev/null`<br>+    VERSION=`${GIT} describe --tags --dirty 2> /dev/null`<br>     if [ $? -eq 0 ]; then<br>         if [ "${VERSION:(-6)}" = "-dirty" ]; then<br>-            VERSION=`${GIT} describe --long --dirty=M 2> /dev/null`<br>+            VERSION=`${GIT} describe --tags --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/6437">change 6437</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/6437"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I32b7e6c1e3463a917ab6532c2c3fc95c8de505c9 </div>
<div style="display:none"> Gerrit-Change-Number: 6437 </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: Joshua Colp <jcolp@digium.com> </div>