From e5c6913a8d23ebe49c9e8f95c5236c7a0d8dbac5 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 17 Mar 2021 10:57:32 -0400
Subject: 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")
---
 release/Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release')

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
-- 
cgit v1.2.3