Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Apr 2012 11:12:19 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r234222 - stable/7/sys/conf
Message-ID:  <201204131112.q3DBCJbX076909@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Fri Apr 13 11:12:18 2012
New Revision: 234222
URL: http://svn.freebsd.org/changeset/base/234222

Log:
  MFC r231558: newvers.sh: unbreak git/git-svn support

Modified:
  stable/7/sys/conf/newvers.sh
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/conf/newvers.sh
==============================================================================
--- stable/7/sys/conf/newvers.sh	Fri Apr 13 09:54:36 2012	(r234221)
+++ stable/7/sys/conf/newvers.sh	Fri Apr 13 11:12:18 2012	(r234222)
@@ -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
 	echo "$svnversion"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204131112.q3DBCJbX076909>