[Asterisk-code-review] Revert "make version: Use only annotated tags to determine v... (repotools[master])

[George Joseph]

Hello Joshua Colp,

I'd like you to do a code review. Please visit

    https://gerrit.asterisk.org/6437

to review the following change.


Change subject: Revert "make_version: Use only annotated tags to determine version"
......................................................................

Revert "make_version: Use only annotated tags to determine version"

This reverts commit 697ffe8f1d91d0d1bbac5def4703beb914117166.

Change-Id: I32b7e6c1e3463a917ab6532c2c3fc95c8de505c9
---
M build_tools/make_version
1 file changed, 2 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/37/6437/1

diff --git a/build_tools/make_version b/build_tools/make_version
index e0427bf..f351871 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -27,12 +27,10 @@
     git update-index --refresh >/dev/null 2>&1 || :
 
     MODIFIED=""
-    ${GIT} config --local --replace-all versionsort.prereleaseSuffix -rc
-    
-    VERSION=`${GIT} describe --dirty 2> /dev/null`
+    VERSION=`${GIT} describe --tags --dirty 2> /dev/null`
     if [ $? -eq 0 ]; then
         if [ "${VERSION:(-6)}" = "-dirty" ]; then
-            VERSION=`${GIT} describe --long --dirty=M 2> /dev/null`
+            VERSION=`${GIT} describe --tags --long --dirty=M 2> /dev/null`
             VERSION="GIT-${VERSION}"
         elif [ -z "`${GIT} tag --contains HEAD`" ]; then
             VERSION="GIT-${VERSION}"

-- 
To view, visit https://gerrit.asterisk.org/6437
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32b7e6c1e3463a917ab6532c2c3fc95c8de505c9
Gerrit-Change-Number: 6437
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20170906/5296f6ec/attachment-0001.html>