From nobody Thu Jul 9 15:18:46 2026 X-Original-To: dev-commits-src-branches@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 4gwzBZ5wjvz6kMsb for ; Thu, 09 Jul 2026 15:18:46 +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 4gwzBZ5NXzz3N0d for ; Thu, 09 Jul 2026 15:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783610326; 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=gKtgWqEhVxOpaC2tb+cOwTAHmlUbTjS6u8S0dlB7bFc=; b=K+gZhlylDNelQmsKxIm+ida2ImzI7g6yiI1Cl74IH821kAp1QsS6L4ZUeqIuHEdcBhTYSe oVOSZ65bmZza2YcUAM7ytZueCYmIdTF0G8TW1yEwxHEtDd5i++ssZy18jrA4gP1/z3YPYn 4KViAQ8TX5G9nHghQw3tL2BY1ee5B/kyIe0Tu1iRrUG9C2eMYuH2NUqoIjXOgbpqjsz6pG jKcdf+2W760831EzP3LhE3VshKDLuCmlieOCSUdH40MHwrIQlE3SYf4WLCe2S9tXyvQu/a aPxt1gbz2j5oDaORj3naE1vZXuYNz56EoUl9Jv0yWWN//ue4UwJ/guUHSLW9dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783610326; a=rsa-sha256; cv=none; b=xcw9PTOK5XVxBgMiOCA/VBtYjLVc6LJYhUvihVHGl0YBf7Ce958Ge5QJ7j0Tp4Gl7HIIe8 mieq6jALcuyAn4T8zAzD8EF/mPfR9D5ip4Qb+rgsIi76NYteMkCYKHc6D9pHO+UdSWNI/R Ne4nXNeefBLtcPVgaPlfIuddOZL308GoYF9frD/7XJre8J1bZUXwvhNdX2CNdte2KEFxRN +cXIgeQ3FcNA1WpZUDO3b0qYlv+8ItHQEir2ScDjqiXX5H2vWFHgcqH/8r540GpG5fMV0K 3zKbo4FV6T0IPeG/2unwj24sfvZbzvufVlJO3r7+7QHtVD8O3o7WKwLJRPmZXg== 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=1783610326; 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=gKtgWqEhVxOpaC2tb+cOwTAHmlUbTjS6u8S0dlB7bFc=; b=E1TLHCkwqJelI2Xxfmxaaw2UnYL71ANNNu19SkDG2HZq3zMM/3vXdnYH0XfLWC2wC7YfIG gy6FmJaqlbOce1s+WH8jnJyrSxHNfLZVZjLr1ps3v+15MzG4yFXDyH1fBkr8p3v/yzn/4U 5rxCUrWnxG92F/CwVtNiEwzKDeFdC4vINOwYFtsAjmFK09kL3tA1hyvXJkGqxGDNB2Ad2+ wvFs4hjwR7b+gKSTz/BYNJeiDEhxhjvGoJLJVzttkXmF4oJOGhWR85HhV43GJuWMTwtCeq fPXHSuOqWQY1gtuNVCy6ZfgaCQWG8ltz8IyQZ5tMBdWahj/fKpw2Utr36ZXtDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwzBZ3YHtz1CRy for ; Thu, 09 Jul 2026 15:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a79 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Jul 2026 15:18:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 45da2c1e1d20 - stable/15 - newvers.sh: Avoid spurious -dirty in git revision List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 45da2c1e1d202ab190f156dd63403be79fb11e94 Auto-Submitted: auto-generated Date: Thu, 09 Jul 2026 15:18:46 +0000 Message-Id: <6a4fbbd6.31a79.21eb34a9@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=45da2c1e1d202ab190f156dd63403be79fb11e94 commit 45da2c1e1d202ab190f156dd63403be79fb11e94 Author: Ed Maste AuthorDate: 2026-07-01 14:35:10 +0000 Commit: Ed Maste CommitDate: 2026-07-09 15:18:31 +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) --- 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 7ce82a1af9f8..afd7e8c35d2b 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