Date: Wed, 7 Aug 2013 07:39:52 +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-8@freebsd.org Subject: svn commit: r254046 - stable/8/sys/conf Message-ID: <201308070739.r777dqul085568@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Wed Aug 7 07:39:52 2013 New Revision: 254046 URL: http://svnweb.freebsd.org/changeset/base/254046 Log: MFC r253602: newvers.sh: add another git-svn fallback Modified: stable/8/sys/conf/newvers.sh Directory Properties: stable/8/sys/ (props changed) stable/8/sys/conf/ (props changed) Modified: stable/8/sys/conf/newvers.sh ============================================================================== --- stable/8/sys/conf/newvers.sh Wed Aug 7 07:39:44 2013 (r254045) +++ stable/8/sys/conf/newvers.sh Wed Aug 7 07:39:52 2013 (r254046) @@ -121,6 +121,11 @@ 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 [ -z "$svn" ] ; then + svn=`$git_cmd log --format='format:%N' | \ + grep '^svn ' | head -1 | \ + sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p'` + fi if [ -n "$svn" ] ; then svn=" r${svn}" git="+${git}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308070739.r777dqul085568>