From 8ecfb6d56ffd074f0371e77b72361306b8f88465 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 1 Sep 2010 09:49:36 -0400 Subject: [PATCH] Yet another attempt at pushing my citadel/scripts/mk_svn_revision.sh changes to the stable-78x branch --- citadel/scripts/mk_svn_revision.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 -- 2.30.2