Fix the CopySetHaikuRevision1 rule if you're building in a plain git

repository, not mirroed via git-svn. Calling git-svn on a plain
repository seems to cause it to go haywire.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33192 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Travis Geiselbrecht 2009-09-19 20:19:50 +00:00
parent 03187b607b
commit 39c91458b2

View File

@ -319,7 +319,7 @@ actions CopySetHaikuRevision1
# Try svn or git-svn
# Extract from "Revision: 12345" line
revision=`(LC_ALL=C LANG=C svn info $(HAIKU_TOP) ||
(cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info)) 2> /dev/null |
(cd $(HAIKU_TOP) && [ -d .git/svn ] && LC_ALL=C LANG=C git svn info)) 2> /dev/null |
grep Revision | awk '{printf $2}'`
if [ "$revision" = 0 -o "$revision" = "" ]; then
# git-svn not present or not configured for this repository