svn commit: r256014 - head/sys/conf

Rui Paulo rpaulo at FreeBSD.org
Thu Oct 3 01:53:18 UTC 2013


Author: rpaulo
Date: Thu Oct  3 01:53:17 2013
New Revision: 256014
URL: http://svnweb.freebsd.org/changeset/base/256014

Log:
  Append the Git branch to the version string.
  
  Approved by:	re (gjb)

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Thu Oct  3 01:18:06 2013	(r256013)
+++ head/sys/conf/newvers.sh	Thu Oct  3 01:53:17 2013	(r256014)
@@ -159,6 +159,10 @@ if [ -n "$git_cmd" ] ; then
 			git=" ${git}"
 		fi
 	fi
+	git_b=`$git_cmd rev-parse --abbrev-ref HEAD`
+	if [ -n "$git_b" ] ; then
+		git="${git}(${git_b})"
+	fi
 	if $git_cmd --work-tree=${SYSDIR}/.. diff-index \
 	    --name-only HEAD | read dummy; then
 		git="${git}-dirty"


More information about the svn-src-all mailing list