Date: Thu, 29 Apr 2021 15:57:03 GMT From: Glen Barber <gjb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0490d82acef8 - stable/13 - release: sync 'git count' logic with newvers.sh Message-ID: <202104291557.13TFv39D059178@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=0490d82acef865eef70d3214f695c93b4cf3aef2 commit 0490d82acef865eef70d3214f695c93b4cf3aef2 Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2021-03-17 14:57:32 +0000 Commit: Glen Barber <gjb@FreeBSD.org> CommitDate: 2021-04-29 15:44:46 +0000 release: sync 'git count' logic with newvers.sh Sync determining the git count with newvers.sh by adding the --first-parent argument. This ensures uname(1) reflects the file name for snapshots. Reported by: Mark Millard Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit e5c6913a8d23ebe49c9e8f95c5236c7a0d8dbac5) --- release/Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.inc1 b/release/Makefile.inc1 index 64f7c6e049a4..da7226dfa890 100644 --- a/release/Makefile.inc1 +++ b/release/Makefile.inc1 @@ -22,7 +22,7 @@ GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD 2>/dev/null || . export GITREV . endif . if !defined(GITCOUNT) || empty(GITCOUNT) -GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --count HEAD 2>/dev/null || true +GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --first-parent --count HEAD 2>/dev/null || true . export GITCOUNT . endif .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104291557.13TFv39D059178>