From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 14:26:09 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27A164F679E; Fri, 22 Jan 2021 14:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMhQ85y2Nz3Fx1; Fri, 22 Jan 2021 14:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEA642013D; Fri, 22 Jan 2021 14:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10MEQ8wG049987; Fri, 22 Jan 2021 14:26:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10MEQ842049986; Fri, 22 Jan 2021 14:26:08 GMT (envelope-from git) Date: Fri, 22 Jan 2021 14:26:08 GMT Message-Id: <202101221426.10MEQ842049986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 51d73a3e46cf - stable/13 - newvers.sh: restore reporting branch names MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51d73a3e46cf9118bc0464c9c0aa99dca7aafe9a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 14:26:09 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=51d73a3e46cf9118bc0464c9c0aa99dca7aafe9a commit 51d73a3e46cf9118bc0464c9c0aa99dca7aafe9a Author: Mateusz Guzik AuthorDate: 2021-01-22 13:00:24 +0000 Commit: Mateusz Guzik CommitDate: 2021-01-22 14:25:48 +0000 newvers.sh: restore reporting branch names It got removed arguably without much discussion in the commit which added gitup support. (cherry picked from commit ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01) --- sys/conf/newvers.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 2afaa3a92f8e..8739cf6fc498 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