Yet another attempt at pushing my citadel/scripts/mk_svn_revision.sh changes to the...

[citadel.git] / citadel / scripts / mk_svn_revision.sh

diff --git a/citadel/scripts/mk_svn_revision.sh b/citadel/scripts/mk_svn_revision.sh
index 2c5e1e26e6572b06688b699e3c7911c3c45a6954..a325bf3348df67208bc12c6528dfa71f543e84f3 100755 (executable)
--- 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