svn commit: r324396 - stable/11/sys/conf

[Ed Maste]

Author: emaste
Date: Sat Oct  7 20:17:03 2017
New Revision: 324396
URL: https://svnweb.freebsd.org/changeset/base/324396

Log:
  MFC r323394: newvers.sh: accept "git-svn-id:" at the start of a line only
  
  This prevents incorrect subversion revision detection when "git svn" is
  not being used to get the sources but git is available. Previously old
  subversion revisions included in commit messages were favoured over the
  more recent and correct revisions in git notes.
  
  For example cf1f35574722 represents r315395 but was treated as r313908
  which is referenced in the commit message. Commits following
  r315395/cf1f35574722 but before another commit with a git-svn-id
  reference in the commit message would be treated as r313908 as well.
  
  Patch from PR updated to accommodate the initial four space indent in
  `git log` ouptut.
  
  PR:		221848
  Submitted by:	Fabian Keil
  Obtained from:	ElectroBSD

Modified:
  stable/11/sys/conf/newvers.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Sat Oct  7 20:14:30 2017	(r324395)
+++ stable/11/sys/conf/newvers.sh	Sat Oct  7 20:17:03 2017	(r324396)
@@ -218,7 +218,7 @@ if [ -n "$git_cmd" ] ; then
 		svn=" r${svn}"
 		git="=${git}"
 	else
-		svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \
+		svn=`$git_cmd log | grep '^    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' | \