From 3954512dff5cb3bc51fa43a181afd65d714a5f0d Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Wed, 8 May 2013 13:16:04 -0700 Subject: [PATCH] Set version to v1.6.5.2.GIT --- GIT-VERSION-GEN | 6 +++--- git-gui/GIT-VERSION-GEN | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 710d361233..e7aaaea5ee 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,16 +1,16 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.5.GIT +DEF_VER=v1.6.5.2.GIT LF=' ' # First see if there is a version file (included in release tarballs), # then try git-describe, then default. -if test -f version +if : then - VN=$(cat version) || VN="$DEF_VER" + VN=$(cat version 2>/dev/null) || VN="$DEF_VER" elif test -d .git -o -f .git && VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && case "$VN" in diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN index b3f937eace..2cd5a5b052 100755 --- a/git-gui/GIT-VERSION-GEN +++ b/git-gui/GIT-VERSION-GEN @@ -67,7 +67,7 @@ case "$dirty" in *) VN="$VN-dirty" ;; esac - +VN="$DEF_VER" if test -r $GVF then VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) -- 2.11.4.GIT