From: Jim Meyering <jim@meyering.net>
Date: Thu, 30 Aug 2007 21:13:06 +0000 (+0200)
Subject: Shorten the snapshot version string by removing the "g".
X-Git-Tag: v6.9.89~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42a4957361cee5e3d5f8772daca0dddebc3162dc;p=thirdparty%2Fcoreutils.git

Shorten the snapshot version string by removing the "g".

* build-aux/git-version-gen: Remove git-describe's "g" that would
always precede the abbreviated SHA1.  Suggestion from Dmitry V. Levin.
---

diff --git a/ChangeLog b/ChangeLog
index a643636758..a5b1c8bfc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-30  Jim Meyering  <jim@meyering.net>
 
+	Shorten the snapshot version string by removing the "g".
+	* build-aux/git-version-gen: Remove git-describe's "g" that would
+	always precede the abbreviated SHA1.  Suggestion from Dmitry V. Levin.
+
 	Perform the s,rm,/bin/rm, fix-up properly.  No more kludge.
 	* Makefile.am (EXTRA_DIST): Remove .kludge-stamp.
 	(.kludge-stamp): Remove rule.  Instead, ...
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 4a631116b8..0fe5f36885 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -38,7 +38,8 @@ elif test -d .git \
 	 *) (exit 1) ;;
        esac
 then
-    v=`echo "$v" | sed 's/-/./g'`;
+    # Remove the "g" in git-describe's output string; change each - to a '.'
+    v=`echo "$v" | sed 's/\(.*\)-g/\1-/;s/-/./g'`;
 else
     v=$default_version
 fi