From owner-svn-src-stable-7@FreeBSD.ORG  Fri Apr 13 11:12:19 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A5323106566B;
	Fri, 13 Apr 2012 11:12:19 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FD208FC0A;
	Fri, 13 Apr 2012 11:12:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3DBCJBJ076911;
	Fri, 13 Apr 2012 11:12:19 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DBCJbX076909;
	Fri, 13 Apr 2012 11:12:19 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204131112.q3DBCJbX076909@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 13 Apr 2012 11:12:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234222 - stable/7/sys/conf
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 11:12:19 -0000

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"