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

[Ed Maste]

Author: emaste
Date: Tue Sep  5 00:46:50 2017
New Revision: 323168
URL: https://svnweb.freebsd.org/changeset/base/323168

Log:
  MFC r322798: newvers.sh: accommodate `git worktree`
  
  newvers.sh looks for a .vcs subdirectory (e.g. .git, .svn) to determine
  which vcs info tool to run (e.g., git rev-parse, svn info).
  
  (As of r308789 in head / r323167 in stable/11 if a .vcs subdirectory is
  not found at ${TOPDIR} then newvers.sh walks up successive parent
  directories, testing for the .vcs subdirectory at each step.  This is
  done in case the FreeBSD source is built in a subdirectory as part of
  some larger project, but either way newvers.sh still tests for the .vcs
  subdirectory.)
  
  However, when using git worktree there is no .git subdirectory but
  rather a plain text .git file which contains a reference to the main
  working tree.
  
  Change findvcs() to test that the .vcs entry exists, regardless of type.
  
  Sponsored by:	The FreeBSD Foundation

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	Tue Sep  5 00:44:04 2017	(r323167)
+++ stable/11/sys/conf/newvers.sh	Tue Sep  5 00:46:50 2017	(r323168)
@@ -62,7 +62,7 @@ findvcs()
 	savedir=$(pwd)
 	cd ${SYSDIR}/..
 	while [ $(pwd) != "/" ]; do
-		if [ -d "./$1" ]; then
+		if [ -e "./$1" ]; then
 			VCSDIR=$(pwd)"/$1"
 			cd ${savedir}
 			return 0