SF.net SVN: geany:[5158] trunk

[ntrel at users.sourceforge.net]

Revision: 5158
          http://geany.svn.sourceforge.net/geany/?rev=5158&view=rev
Author:   ntrel
Date:     2010-08-13 14:05:34 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
Check for git-svn repo, not just git because find-rev doesn't
always fail with a git-only repo.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-13 11:41:39 UTC (rev 5157)
+++ trunk/ChangeLog	2010-08-13 14:05:34 UTC (rev 5158)
@@ -1,7 +1,14 @@
+2010-08-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * configure.ac:
+   Check for git-svn repo, not just git because find-rev doesn't
+   always fail with a git-only repo.
+
+
 2010-08-12  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * src/search.c:
-   Fix a memory leak based on input by Daniel Marjamäki. Thanks. 
+   Fix a memory leak based on input by Daniel Marjamäki. Thanks.
 
 
 2010-08-11  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-08-13 11:41:39 UTC (rev 5157)
+++ trunk/configure.ac	2010-08-13 14:05:34 UTC (rev 5158)
@@ -53,9 +53,13 @@
 GIT=`which git 2>/dev/null`
 if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"
 then
-	REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
+	# check for git-svn repo first - find-rev (v1.5.4.1) doesn't always fail with git-only repo
+	git svn info &>/dev/null
+	if test "x$?" == "x0"; then
+		REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
 				git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null ||
 				git svn find-rev master 2>/dev/null || echo 0`
+	fi
 fi
 if test "x${REVISION}" = "xr0"
 then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.