git: 3c1d72efd751 - stable/11 - newvers: tweak uname to be more useful
Li-Wen Hsu
lwhsu at FreeBSD.org
Wed Feb 3 15:06:44 UTC 2021
The branch stable/11 has been updated by lwhsu:
URL: https://cgit.FreeBSD.org/src/commit/?id=3c1d72efd7518bde6d96c6470efc85252fa8e64d
commit 3c1d72efd7518bde6d96c6470efc85252fa8e64d
Author: Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-01-25 19:53:31 +0000
Commit: Li-Wen Hsu <lwhsu at FreeBSD.org>
CommitDate: 2021-02-03 15:01:51 +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
(cherry picked from commit 8a51f14a7833fd14e1f125e63a0af9d260dcd287)
---
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 9b7a1c19991a..e3c54f1649fb 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -213,9 +213,9 @@ fi
if [ -n "$git_cmd" ] ; then
git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null)
- 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
git_b=$($git_cmd rev-parse --abbrev-ref HEAD)
if [ -n "$git_b" -a "$git_b" != "HEAD" ] ; then
More information about the dev-commits-src-all
mailing list