From: Art Cancro <ajc@citadel.org>
Date: Wed, 1 Sep 2010 13:49:36 +0000 (-0400)
Subject: Yet another attempt at pushing my citadel/scripts/mk_svn_revision.sh changes to the... 
X-Git-Tag: v7.86~66
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8ecfb6d56ffd074f0371e77b72361306b8f88465

Yet another attempt at pushing my citadel/scripts/mk_svn_revision.sh changes to the stable-78x branch
---

diff --git a/citadel/scripts/mk_svn_revision.sh b/citadel/scripts/mk_svn_revision.sh
index 2c5e1e26e..a325bf334 100755
--- a/citadel/scripts/mk_svn_revision.sh
+++ b/citadel/scripts/mk_svn_revision.sh
@@ -24,11 +24,9 @@ if test -d $SRC_DIR/.svn  ; then
 		CAN_BUILD_SVN_REVISION="yes"
 	fi
 else 
-    if git status> /dev/null 2>&1; then 
+    if test -d $SRC_DIR/../.svn  ; then
 	echo "have Git repository."
-	TAG=`git rev-parse HEAD`
-	BRANCH="`git show-branch |sed 's;\[\(.*\)\].*;\1;'`"
-	BUILD="GIT: $BRANCH : $TAG"
+	BUILD=`/usr/bin/git log -1 --pretty=%H . `
 	echo "This code base git-revision: $BUILD"
 	CAN_BUILD_SVN_REVISION="yes"
     else