X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=d6d1ae0338085d8d3ea567d8007f05ab5f2ee554;hb=692c7fc9cb81a2f68b23199d5b8612494fe4d317;hp=73aaff0a2979de8bcfd72f8a10793a07f17c18ad;hpb=2111168f314ac4f53932b8bbb16191a3855f5b6f;p=git.git

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 73aaff0a..d6d1ae03 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,13 +1,18 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.GIT
+DEF_VER=v1.2.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
-VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) ||
-VN=$(cat version) ||
-VN="$DEF_VER"
+if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
+	VN=$(echo "$VN" | sed -e 's/-/./g');
+elif test -f version
+then
+	VN=$(cat version) || VN="$DEF_VER"
+else
+	VN="$DEF_VER"
+fi
 
 VN=$(expr "$VN" : v*'\(.*\)')