aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-03-17 14:57:32 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-03-17 14:57:32 +0000
commite5c6913a8d23ebe49c9e8f95c5236c7a0d8dbac5 (patch)
treea0c7a9d3bb36f99e66d9ec40bda582667ef4c384 /release
parent4fbbe523653b6d2a0186aca38224efcab941deaa (diff)
downloadsrc-e5c6913a8d23ebe49c9e8f95c5236c7a0d8dbac5.tar.gz
src-e5c6913a8d23ebe49c9e8f95c5236c7a0d8dbac5.zip
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 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate")
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile.inc1 b/release/Makefile.inc1
index a97dee9994b6..99d61a45e700 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