diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2021-01-22 13:00:24 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2021-01-22 13:03:15 +0000 |
| commit | ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01 (patch) | |
| tree | 6f2fa0818d48293abc23e1cc8cb3ff3cac0f3a51 | |
| parent | e808c8309cc6ba9c42d68825dc445937a740c9e4 (diff) | |
| download | src-ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01.tar.gz src-ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01.zip | |
newvers.sh: restore reporting branch names
It got removed arguably without much discussion in the commit which
added gitup support.
| -rw-r--r-- | sys/conf/newvers.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 |