From: Junio C Hamano <junkio@cox.net>
Date: Mon, 16 Jan 2006 08:58:45 +0000 (-0800)
Subject: Allow building of RPM from interim snapshot.
X-Git-Tag: v1.2.0~137
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5c7d3c9507f74a6f5c3f44915c42ee9ec22c1211;p=git.git

Allow building of RPM from interim snapshot.

By popular demand.  If you build and install such binary RPMs,
the version numbering will lose monotonicity, so you may have to
later override downgrade warnings from your packaging manager,
but as long as you are aware of that and know how to deal with it,
there is no reason for us to forbid it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 73aaff0a..e3cd9fa0 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,7 +5,7 @@ DEF_VER=v1.1.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=$(git-describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
 VN=$(cat version) ||
 VN="$DEF_VER"