git: 8a51f14a7833 - main - newvers: tweak uname to be more useful

[Warner Losh]

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=8a51f14a7833fd14e1f125e63a0af9d260dcd287

commit 8a51f14a7833fd14e1f125e63a0af9d260dcd287
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-01-25 19:53:31 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-01-29 00:44:56 +0000

    newvers: tweak uname to be more useful
    
    The current uname is branch-cXXXX-gHASH
    
    Three changes to make uname more useful.
    1. Move from using git rev-list --count to git rev-lis --count --first-parent
       since that gives a better, incrementing number.
    2. Report this count as 'nXXXXX' rather than 'cXXXXX' because c is part of
       a hash and we've changed the sematnics of XXXXX
    3. Remove g to make HASH cut and pastable.
    
    Durting review, #1 & #3 had the largest consensus. There was a diversity of
    opinion on #2, but on the whole it was positive so I'll acknowledge the dissent,
    but move forward with something seems to have support since the dissent was all
    about what letter to use where I chose 'n'.
    
    MFC After: 3 days
    Reviewed by: rgrimes, emaste (earlier version)
    Differential Revision: https://reviews.freebsd.org/D28338
---
 sys/conf/newvers.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 497ea44cdd64..847c01186aeb 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -253,9 +253,9 @@ fi
 if [ -n "$git_cmd" ] ; then
 	git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null)
 	if [ "$($git_cmd rev-parse --is-shallow-repository)" = false ] ; then
-		git_cnt=$($git_cmd rev-list --count HEAD 2>/dev/null)
+		git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null)
 		if [ -n "$git_cnt" ] ; then
-			git="c${git_cnt}-g${git}"
+			git="n${git_cnt}-${git}"
 		fi
 	fi
 	git_b=$($git_cmd rev-parse --abbrev-ref HEAD)