Date: Tue, 25 Aug 2020 18:30:12 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364778 - projects/release-git/release Message-ID: <202008251830.07PIUCit042115@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 .export GITREV .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008251830.07PIUCit042115>