svn commit: r231558 - head/sys/conf

[Andriy Gapon]

Author: avg
Date: Sun Feb 12 14:54:19 2012
New Revision: 231558
URL: http://svn.freebsd.org/changeset/base/231558

Log:
  newvers.sh: unbreak git/git-svn support
  
  MFC after:	2 weeks

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Sun Feb 12 07:59:25 2012	(r231557)
+++ head/sys/conf/newvers.sh	Sun Feb 12 14:54:19 2012	(r231558)
@@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin;
 		svnversion=${dir}/svnversion
 		break
 	fi
-	if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
-		git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
-		break
-	fi
 done
+if [ -d "${SYSDIR}/../.git" ] ; then
+	for dir in /bin /usr/bin /usr/local/bin; do
+		if [ -x "${dir}/git" ] ; then
+			git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+			break
+		fi
+	done
+fi
 
 if [ -n "$svnversion" ] ; then
 	svn=`cd ${SYSDIR} && $svnversion`