diff options
Diffstat (limited to 'GIT-VERSION-GEN')
| -rwxr-xr-x | GIT-VERSION-GEN | 71 |
1 files changed, 19 insertions, 52 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index cfe46a857e..2ba142a11e 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,65 +1,30 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=0.9.GITGUI +DEF_VER=v1.5.4-rc3.GIT LF=' ' -tree_search () -{ - head=$1 - tree=$2 - for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null) - do - test $tree = $(git rev-parse $p^{tree} 2>/dev/null) && - vn=$(git describe --abbrev=4 $p 2>/dev/null) && - case "$vn" in - gitgui-[0-9]*) echo $vn; break;; - esac - done -} - -# Always use the tarball version file if found, just -# in case we are somehow contained in a larger git -# repository that doesn't actually track our state. -# (At least one package manager is doing this.) -# -# We may be a subproject, so try looking for the merge -# commit that supplied this directory content if we are -# not at the toplevel. We probably will always be the -# second parent in the commit, but we shouldn't rely on -# that fact. -# -# If we are at the toplevel or the merge assumption fails -# try looking for a gitgui-* tag. - -if test -f version && - VN=$(cat version) -then - : happy -elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" - test -n "$prefix" && - head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) && - tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) && - VN=$(tree_search $head $tree) - case "$VN" in - gitgui-[0-9]*) : happy ;; - *) (exit 1) ;; - 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/^gitgui-//;s/-/./g'); -elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && - case "$VN" in - gitgui-[0-9]*) : happy ;; - *) (exit 1) ;; - esac + VN=$(cat version) || VN="$DEF_VER" +elif test -d .git && + VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && + case "$VN" in + *$LF*) (exit 1) ;; + v[0-9]*) : happy ;; + esac then - VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); + VN=$(echo "$VN" | sed -e 's/-/./g'); else VN="$DEF_VER" fi +VN=$(expr "$VN" : v*'\(.*\)') + dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty= case "$dirty" in '') @@ -70,11 +35,13 @@ esac if test -r $GVF then - VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) + VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) else VC=unset fi test "$VN" = "$VC" || { - echo >&2 "GITGUI_VERSION = $VN" - echo "GITGUI_VERSION = $VN" >$GVF + echo >&2 "GIT_VERSION = $VN" + echo "GIT_VERSION = $VN" >$GVF } + + |