From owner-svn-src-all@FreeBSD.ORG Wed Jul 24 09:05:05 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 73FF9298; Wed, 24 Jul 2013 09:05:05 +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 653F3238E; Wed, 24 Jul 2013 09:05:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O955wm089025; Wed, 24 Jul 2013 09:05:05 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O955dB089024; Wed, 24 Jul 2013 09:05:05 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307240905.r6O955dB089024@svn.freebsd.org> From: Andriy Gapon Date: Wed, 24 Jul 2013 09:05:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253601 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jul 2013 09:05:05 -0000 Author: avg Date: Wed Jul 24 09:05:04 2013 New Revision: 253601 URL: http://svnweb.freebsd.org/changeset/base/253601 Log: newvers.sh: fix the fallback case of git-svn detection MFC after: 5 days Sponsored by: HybridCluster Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Wed Jul 24 08:56:59 2013 (r253600) +++ head/sys/conf/newvers.sh Wed Jul 24 09:05:04 2013 (r253601) @@ -132,7 +132,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