svn commit: r253602 - head/sys/conf

[Andriy Gapon]

Author: avg
Date: Wed Jul 24 09:06:50 2013
New Revision: 253602
URL: http://svnweb.freebsd.org/changeset/base/253602

Log:
  newvers.sh: add another git-svn fallback
  
  This time it is for a git mirror that stores svn revisions as
  git notes, e.g. https://github.com/freebsd/freebsd
  
  MFC after:	10 days
  Sponsored by:	HybridCluster

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Wed Jul 24 09:05:04 2013	(r253601)
+++ head/sys/conf/newvers.sh	Wed Jul 24 09:06:50 2013	(r253602)
@@ -132,6 +132,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}"