projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
10b0260
)
Yet another attempt at pushing my citadel/scripts/mk_svn_revision.sh changes to the...
author
Art Cancro
<ajc@citadel.org>
Wed, 1 Sep 2010 13:49:36 +0000
(09:49 -0400)
committer
Art Cancro
<ajc@citadel.org>
Wed, 1 Sep 2010 13:50:54 +0000
(09:50 -0400)
citadel/scripts/mk_svn_revision.sh
patch
|
blob
|
history
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