Date: Fri, 22 Jan 2021 13:03:22 GMT From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ace7209ce04d - main - newvers.sh: restore reporting branch names Message-ID: <202101221303.10MD3MRT045598@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01 commit ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01 Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2021-01-22 13:00:24 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2021-01-22 13:03:15 +0000 newvers.sh: restore reporting branch names It got removed arguably without much discussion in the commit which added gitup support. --- sys/conf/newvers.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6482417b3ebe..605e61181dec 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -258,6 +258,10 @@ if [ -n "$git_cmd" ] ; then git="c${git_cnt}-g${git}" fi fi + git_b=$($git_cmd rev-parse --abbrev-ref HEAD) + if [ -n "$git_b" -a "$git_b" != "HEAD" ] ; then + git="${git_b}-${git}" + fi if git_tree_modified; then git="${git}-dirty" modified=yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101221303.10MD3MRT045598>