From nobody Fri Jul 3 13:35:21 2026 X-Original-To: dev-commits-src-main@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 4gsFB22g1Hz6dYHQ for ; Fri, 03 Jul 2026 13:35:22 +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 4gsFB21dknz3KJq for ; Fri, 03 Jul 2026 13:35:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783085722; 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=V5DUoHzpTuYqvf34BijyykmRUihnO+rFHvig9Pu9LlE=; b=wZ/5AaoGQhcjqTZIf3om4mB6uQhv9vAvtMOgVUkrjfRdJoM5VQ/CwE8LBXYW/2O4rwoqeT qbZAF8nFsaJ2FjmpZYGw99pQWLaT6bTZNl/+F0qXbPpHsE0f4YfHWabTjxseO37UHRJTsu bvJxQw7yB1IaIGY7N9pSPWeJWip5NgBzX7J3FtUuRc4DwoU6GW9R2tRVNnNUQeC/NbdeRi 8XHB80elup/GpWk01YxK5+whTIa38ruUFBykn75gjkCLesy0ylbSuOy0FGt3e+zuIWDMrA /I2Aewx+wJ+gIHnh2/SQSQQ1XQh1+IGtbQ1LYi86+/cO/0lyxgji/8q0aYhtKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783085722; a=rsa-sha256; cv=none; b=fEKSCY31y3nQye/VLzXQohQe1WN+zMFqkbES9PWxqcz5QgK84ehuqYCtlbx8iGBuoqdP+f RBTxzsxHT8mG0uk+XGlPhsVUzpPO+AUVu5rMeeRTiznOBnFoh64pptFWrfKCKybEPGDxLt ViWy37CmCU77qxFLHBJcI0HWRNYXAqjuYnZxNfOEQE7VY8+GphGsCTikovtHMaVSbManog GzEXZWAFw4oZCYrQCDMha//eHaXhSMeH4rp1kl3/5GeP+s3047s9KIqfa2di+EQ1IJcmLJ m+ZB8rJa532Sxx3IdBvIsOrgiETVJjJUPioBxnvbQTU+umye2HOLeetbpJ6UJA== 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=1783085722; 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=V5DUoHzpTuYqvf34BijyykmRUihnO+rFHvig9Pu9LlE=; b=QjyON+b4gzlTmE0oZ0Y75Lyywl0MPAu0wlPQqgZuBy5p2kSmgBnkw7ofAEXTcmdJj66VE8 Jk2uP0gWdnqvWGSA9tq7IFg+JQXF6bSH8wn4iP8L84j/14jk2EJl2wYWhOSYZ/3NzHgG/C JUBNO+kroUv+w3aKV44bi9TEEtxR6lO8bJNCB5ckuGwpkZCWT6i0kLoCY3eDcQhd7OXq3t /lfrM5XHfmjmQ6+L17mnVtFcNj/4opZpffLDRHzoJrCpCAq4NxCCWQd/nNOaBgM3jqSGAk ENqRuUKePAgl3XJG6hDXiIS+3hoyR5/wOmyBM2vsqycr9mtj6noNLqwtWADcyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gsFB173kczqYS for ; Fri, 03 Jul 2026 13:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a9d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Jul 2026 13:35:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 465a3b7adc00 - main - newvers.sh: Avoid spurious -dirty in git revision List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 465a3b7adc008c068741594f6c922ede98924f39 Auto-Submitted: auto-generated Date: Fri, 03 Jul 2026 13:35:21 +0000 Message-Id: <6a47ba99.3a9d2.1dbc3662@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=465a3b7adc008c068741594f6c922ede98924f39 commit 465a3b7adc008c068741594f6c922ede98924f39 Author: Ed Maste AuthorDate: 2026-07-01 14:35:10 +0000 Commit: Ed Maste CommitDate: 2026-07-03 13:34:58 +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 --- 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 145377c1e75e..de696a192853 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -260,21 +260,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