From: Felipe Contreras Date: Fri, 13 Sep 2013 01:17:26 GMT Subject: [PATCH v2 2/2] version-gen: avoid messing the version Message-ID: <1379035046-6688-3-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1379035046-6688-1-git-send-email-felipe.contreras@gmail.com> If the version is 'v1.8.4-rc1' that is the version, and there's no need to change it to anything else, like 'v1.8.4.rc1'. If RedHat, or somebody else, needs a specific version, they can use the 'version' file, like everybody else. Signed-off-by: Felipe Contreras --- GIT-VERSION-GEN | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e96538d..b3de2db 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -26,10 +26,8 @@ describe () { if test -f version then VN=$(cat version) || VN="$DEF_VER" -elif test -d ${GIT_DIR:-.git} -o -f .git && describe +elif test ! -d ${GIT_DIR:-.git} -o ! -f .git || ! describe then - VN=$(echo "$VN" | sed -e 's/-/./g') -else VN="$DEF_VER" fi -- 1.8.4-338-gefd7fa6