Date: Tue, 25 Aug 2020 19:35:39 -0300 From: Renato Botelho <garga@FreeBSD.org> To: Glen Barber <gjb@FreeBSD.org>, src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: Re: svn commit: r364778 - projects/release-git/release Message-ID: <ac8adb17-bda9-09a1-b7d6-c17f0bd326f5@FreeBSD.org> In-Reply-To: <202008251830.07PIUCit042115@repo.freebsd.org> References: <202008251830.07PIUCit042115@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 25/08/20 15:30, Glen Barber wrote: > Author: gjb > Date: Tue Aug 25 18:30:12 2020 > New Revision: 364778 > URL: https://svnweb.freebsd.org/changeset/base/364778 > > Log: > Fix the current working directory when setting GITREV and > GITBRANCH. > > Sponsored by: Rubicon Communications, LLC (netgate.com) > > Modified: > projects/release-git/release/Makefile.inc1 > > Modified: projects/release-git/release/Makefile.inc1 > ============================================================================== > --- projects/release-git/release/Makefile.inc1 Tue Aug 25 18:22:30 2020 (r364777) > +++ projects/release-git/release/Makefile.inc1 Tue Aug 25 18:30:12 2020 (r364778) > @@ -16,11 +16,11 @@ GIT_CMD= ${_P}/git > > # Set the git branch and hash to export where needed. > .if !defined(GITBRANCH) || empty(GITBRANCH) > -GITBRANCH!= ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///' > +GITBRANCH!= cd ${.CURDIR} && ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///' > .export GITBRANCH > .endif > .if !defined(GITREV) || empty(GITREV) > -GITREV!= ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true > +GITREV!= cd ${.CURDIR} && ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true Hi Glen! It would be simpler if you use git -C parameter instead.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ac8adb17-bda9-09a1-b7d6-c17f0bd326f5>