git-gui: Handle gitgui tags in version gen.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 12 Feb 2007 21:38:29 +0000 (16:38 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 12 Feb 2007 21:38:29 +0000 (16:38 -0500)
I've decided to use gitgui-0.5 as the format for tags in the
git-gui repository. The prefix of gitgui was chosen here to
make its namespace different from the namespace used by git
itself, allowing developers to pull both tag namespaces into
the same repository.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
GIT-VERSION-GEN
index 79558f39cf968d712dc0230dc9cb538f92ad4a78..d3087489c584066c84b8c711a61d058f8ce24cfa 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.5.GIT
+DEF_VER=0.5.GIT
 
 LF='
 '
@@ -11,10 +11,10 @@ LF='
 if VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
    case "$VN" in
    *$LF*) (exit 1) ;;
-   v[0-9]*) : happy ;;
+   gitgui-[0-9]*) : happy ;;
    esac
 then
-       VN=$(echo "$VN" | sed -e 's/-/./g');
+       VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 elif test -f version
 then
        VN=$(cat version) || VN="$DEF_VER"
@@ -22,8 +22,6 @@ 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
 '')