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
This commit is contained in:
parent
8fee65d0c7
commit
8a51f14a78
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user