From nobody Thu Jul 9 15:19:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gwzCs5Vsrz6kMk7 for ; Thu, 09 Jul 2026 15:19:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gwzCs2bkyz3NLg for ; Thu, 09 Jul 2026 15:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783610393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=igquKw5mLNG/9cyp1Qy2xBwzU/uE2AagttcahomPZ0g=; b=VuuKw/2czWFncCoP8+/y57nDPtgmSJXKRHQ5E45xfT8BKAemMukT4gf3eHc5b+cu61e6pS srcECyb6if7ajGJFALtRVZS3u/RNhFHBSI2N+tRK2lvmyc/LY1LqQHuUg7I+0jxIfAwsuU h1Ygz2RqOSO9XvVmYux0qTWzmxdSqSSR9sMj6g4v6wl5ZvhFyruPmXVZQozMQq++blPqBw 3svKPUj4UPijyRDdHfSV09ZNv5ggbtYiP5dA19gJB30Ql5htBRYQDDkahm0U3UxfAIFyqQ uWv9jVpTg0hTr5dhDVzl/BOHQAt352bF2Cfa0PxfWTRIugblzgXTAgfkz9Vc0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783610393; a=rsa-sha256; cv=none; b=wAsWnB37WuldaJvbuhNyaf9kUu4ybjAt28LhXD8r+ndpW+TX2HhBPW0/LcgAecLAJD8gYE 7S7qg8c9XLvWUQ6r5HLAMcuP8QIiCMJj9caXKmAcvSfGMPEdbIs77IsIgKn9JpXai1D4kp RLhpYGNzB9omSVph3ZTqTmaxKTl8j4/PahmvuW6+RHB4LM930lM/btDlTcPDsGboLQHxXy hEON9LApDTlR+RrDkWYSt2+ssUxqItkyv0zVrwn1rkRd3vqtrDoSkBwod2uMZCCkkHkeRB 2HPlSpr0gFvEmRe3TvW5SOad8iYZCk7kqnoOrs5x91qizdmn36DSiO+tL7zgKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783610393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=igquKw5mLNG/9cyp1Qy2xBwzU/uE2AagttcahomPZ0g=; b=gZI2Wlgkvi69p6Hs3cIkg/48bZAlI8kRUQOLm5VSBc0KaZ9Ko/hJ3Isq0krKiQDUL87EfO 4VRY6OwcwRySBet9jOXM3qW103Bjv2XDJNzx5WwzPTdAA6yOamDLFl4r7TKZkeKP1UJsai LmtgbolRgcpOdkbZb+ubnawcHFuP+gK2qBqZx+NZiS7y+/khaeK4no+uh3LZQCn2JGYEqf 3q2yn6rUK75v3V3HZS/hMtQCF+M00/O6rMSV0JAVw3/YUv93pCuaj8rJpM1JjH7eYRgkNx g+nKz6sFlLmI5z/oE4f/FtKUTlXGeAzgKwiYpQdhuIcykgB6At0AcJNzSwLrQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwzCs12lyz2r for ; Thu, 09 Jul 2026 15:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26bb1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Jul 2026 15:19:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6756f09d73de - stable/14 - newvers.sh: Avoid spurious -dirty in git revision List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6756f09d73de7d876501a7f24f07fb362aec35f3 Auto-Submitted: auto-generated Date: Thu, 09 Jul 2026 15:19:53 +0000 Message-Id: <6a4fbc19.26bb1.600eb035@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6756f09d73de7d876501a7f24f07fb362aec35f3 commit 6756f09d73de7d876501a7f24f07fb362aec35f3 Author: Ed Maste AuthorDate: 2026-07-01 14:35:10 +0000 Commit: Ed Maste CommitDate: 2026-07-09 15:19:35 +0000 newvers.sh: Avoid spurious -dirty in git revision If git is installed and .git exists but git rev-parse failed to report a hash we previously produced just "-dirty" as the git revision. Gate the git commit count and -dirty check on the rev-parse passing. Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57995 (cherry picked from commit 465a3b7adc008c068741594f6c922ede98924f39) (cherry picked from commit 45da2c1e1d202ab190f156dd63403be79fb11e94) --- sys/conf/newvers.sh | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index e90e1ef79902..5b5e390228f7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -262,21 +262,23 @@ fi if [ -n "$git_cmd" ] ; then git=$($git_cmd rev-parse --verify --short=12 HEAD 2>/dev/null) - if [ "$($git_cmd rev-parse --is-shallow-repository)" = false ] ; then - git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) - if [ -n "$git_cnt" ] ; then - git="n${git_cnt}-${git}" + if [ $? -eq 0 ]; then + if [ "$($git_cmd rev-parse --is-shallow-repository)" = false ] ; then + git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) + if [ -n "$git_cnt" ] ; then + git="n${git_cnt}-${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 + fi + git=" ${git}" 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 - fi - git=" ${git}" fi if [ -n "$gituprevision" ] ; then