Date: Fri, 6 Jan 2012 18:50:33 +0100 From: Oliver Pinter <pinter@tresorium.hu> To: stable@freebsd.org Cc: current@freebsd.org Subject: [RFC] fix git detection code in newvers.sh when svn installed Message-ID: <201201061850.33863.pinter@tresorium.hu>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_pRzBPReUZlYSbPc
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi All!
When svn installed and the source stored in git, then now the version
detection failed. The attached patch fixed this situation.
--
Oliver Pinter
(Tresorium)
--Boundary-00=_pRzBPReUZlYSbPc
Content-Type: text/x-diff; charset="iso 8859-15";
name="20120103121800-fix-newvers-sh-git.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="20120103121800-fix-newvers-sh-git.diff"
=46rom a84c998c251a83ba3fa3c734b7fbc6fe1af17c6a Mon Sep 17 00:00:00 2001
=46rom: Oliver Pinter <oliver.pntr@gmail.com>
Date: Tue, 3 Jan 2012 12:17:43 +0100
Subject: [PATCH] fix git detection code in newvers.sh
Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c6184a8..b015735 100644
=2D-- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -92,6 +92,9 @@ for dir in /bin /usr/bin /usr/local/bin; do
svnversion=3D${dir}/svnversion
break
fi
+done
+
+for dir in /bin /usr/bin /usr/local/bin; do
if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
git_cmd=3D"${dir}/git --git-dir=3D${SYSDIR}/../.git"
break
--Boundary-00=_pRzBPReUZlYSbPc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201061850.33863.pinter>