X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fversion.sh;fp=src%2Fversion.sh;h=b7f04e258bde4b2142686ba81c0adab5bc32e214;hb=6139e830d50d2c8f995e65f7d98a983884e24f83;hp=e89f996b4063348f1230d8557b2035c1c1f04f4f;hpb=d7be3dd362a308677a9423cac2c61521a1af0e38;p=NeonServV5.git

diff --git a/src/version.sh b/src/version.sh
index e89f996..b7f04e2 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -20,12 +20,13 @@ else \
 codelines=`find . -type f -regex '\./.*\.h' -or -regex '\./.*\.c' |xargs cat|wc -l`
 
 svn_revision=`svn info | grep Revision | grep -o -E '[0-9]+'`
+git_commitcount=0
 if test "x$svn_revision" = "x" ; then
   svn_revision=`git log -n 1 --pretty="format:%h"`
   if test "x$svn_revision" = "x" ; then
     svn_revision="0"
   else
-    git_commitcount=`git rev-list --all --no-merges | wc -l | sed "s/[ \t]//g"`
+    git_commitcount=`git log --pretty=oneline --no-merges --first-parent | wc -l | sed "s/[ \t]//g"`
     svn_revision="git-$git_commitcount-$svn_revision"
   fi
 else
@@ -59,5 +60,7 @@ const char *creation = "$creation";
 const char *revision = "$svn_revision";
 const char *codelines = "$codelines";
 
+const int patchlevel = ($git_commitcount ? ($git_commitcount - VERSION_PATCHLEVEL) : 0);
+
 !SUB!THIS!