From owner-svn-src-stable@FreeBSD.ORG Wed Aug 7 07:38:12 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7777565D; Wed, 7 Aug 2013 07:38:12 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 64BB42D7F; Wed, 7 Aug 2013 07:38:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777cCV7085189; Wed, 7 Aug 2013 07:38:12 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777cCoO085188; Wed, 7 Aug 2013 07:38:12 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070738.r777cCoO085188@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:38:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r254043 - stable/9/sys/conf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:38:12 -0000 Author: avg Date: Wed Aug 7 07:38:11 2013 New Revision: 254043 URL: http://svnweb.freebsd.org/changeset/base/254043 Log: MFC r253601: newvers.sh: fix the fallback case of git-svn detection Modified: stable/9/sys/conf/newvers.sh Directory Properties: stable/9/sys/ (props changed) stable/9/sys/conf/ (props changed) Modified: stable/9/sys/conf/newvers.sh ============================================================================== --- stable/9/sys/conf/newvers.sh Wed Aug 7 07:36:37 2013 (r254042) +++ stable/9/sys/conf/newvers.sh Wed Aug 7 07:38:11 2013 (r254043) @@ -121,7 +121,7 @@ if [ -n "$git_cmd" ] ; then else svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \ sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` - if [ -n $svn ] ; then + if [ -n "$svn" ] ; then svn=" r${svn}" git="+${git}" else