diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-09-12 20:17:25 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-13 12:01:50 -0700 |
| commit | 836a4f5f6d7f2d22c9ea8f70e858cdd689199366 (patch) | |
| tree | 2eb717aa4bfef6b950da91079c77f34ccedfe453 | |
| parent | b3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f (diff) | |
| download | git-fc/git-version-gen.tar.gz | |
version-gen: cleanupfc/git-version-gen
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | GIT-VERSION-GEN | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b444c18f17..30db4de8d2 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -6,22 +6,29 @@ DEF_VER=v1.8.4.GIT LF=' ' -# First see if there is a version file (included in release tarballs), -# then try git-describe, then default. -if test -f version -then - VN=$(cat version) || VN="$DEF_VER" -elif test -d ${GIT_DIR:-.git} -o -f .git && - VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) && +describe () { + VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) || return 1 case "$VN" in - *$LF*) (exit 1) ;; + *$LF*) + return 1 + ;; v[0-9]*) git update-index -q --refresh test -z "$(git diff-index --name-only HEAD --)" || - VN="$VN-dirty" ;; + VN="$VN-dirty" + return 0 + ;; esac +} + +# First see if there is a version file (included in release tarballs), +# then try 'git describe', then default. +if test -f version then - VN=$(echo "$VN" | sed -e 's/-/./g'); + VN=$(cat version) || VN="$DEF_VER" +elif test -d ${GIT_DIR:-.git} -o -f .git && describe +then + VN=$(echo "$VN" | sed -e 's/-/./g') else VN="$DEF_VER" fi @@ -34,9 +41,9 @@ then else VC=unset fi -test "$VN" = "$VC" || { + +if test "$VN" != "$VC" +then echo >&2 "GIT_VERSION = $VN" echo "GIT_VERSION = $VN" >$GVF -} - - +fi |