summaryrefslogtreecommitdiff
path: root/git-gui/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-13 00:07:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-13 00:07:29 (GMT)
commit67c7575947b06a2a9bbdb355357895149bdbd8e5 (patch)
tree8d1a2ad10b83002967b8762b0fef79a32bf2444d /git-gui/GIT-VERSION-GEN
parentd63ea115948a892f94451677c322c5a6f233adc6 (diff)
parentfdf6cfc4266d1e88e74c09e9166fa0b5c9ad29cb (diff)
downloadgit-67c7575947b06a2a9bbdb355357895149bdbd8e5.zip
git-67c7575947b06a2a9bbdb355357895149bdbd8e5.tar.gz
git-67c7575947b06a2a9bbdb355357895149bdbd8e5.tar.bz2
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Change base version to 0.6. git-gui: Guess our version accurately as a subproject. git-gui: Handle gitgui tags in version gen. git-gui: Generate a version file on demand. git-gui: Rename GIT_VERSION to GITGUI_VERSION. git-gui: Allow gitexecdir, INSTALL to be set by the caller.
Diffstat (limited to 'git-gui/GIT-VERSION-GEN')
-rwxr-xr-xgit-gui/GIT-VERSION-GEN55
1 files changed, 43 insertions, 12 deletions
diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN
index 79f1c52..8fac8cb 100755
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
@@ -1,20 +1,53 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v0.5.GIT
+DEF_VER=0.6.GITGUI
LF='
'
-# First try git-describe, then see if there is a version file
-# (included in release tarballs), then default
-if VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+tree_search ()
+{
+ head=$1
+ tree=$2
+ for p in $(git rev-list --parents --max-count=1 $head 2>/devnull)
+ 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
+}
+
+# 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, or fallback onto the
+# distributed version file.
+
+if 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
- *$LF*) (exit 1) ;;
- v[0-9]*) : happy ;;
+ gitgui-[0-9]*) : happy ;;
+ *) (exit 1) ;;
esac
then
- VN=$(echo "$VN" | sed -e 's/-/./g');
+ 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
+then
+ VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
elif test -f version
then
VN=$(cat version) || VN="$DEF_VER"
@@ -22,8 +55,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
'')
@@ -34,13 +65,13 @@ esac
if test -r $GVF
then
- VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)
+ VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
else
VC=unset
fi
test "$VN" = "$VC" || {
- echo >&2 "GIT_VERSION = $VN"
- echo "GIT_VERSION = $VN" >$GVF
+ echo >&2 "GITGUI_VERSION = $VN"
+ echo "GITGUI_VERSION = $VN" >$GVF
}