From nobody Wed Oct 28 05:52:43 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 4jDxNC4SCVz6wrQT for ; Wed, 28 Oct 2026 05:52:43 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jDxNC2Qsgz4LVL for ; Wed, 28 Oct 2026 05:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaQxoUFIsizEY7d5rpn9D1xWXVGwLxM82wDMEmd3mbY=; b=ZqTJDW1vSuu/IfSli0J76WYXTM94FiKmSYuiNPBmXiKh9xX4t0Eu9XRnASS2XDSJjwaD1H 01oIzdeZT5ADTP+hYE2KzmXcijggFi/ARv2RlZQYnO2DnuowS0zZkwbb4hQ+Edu9EP82gL rUnInpW/VxPwPMuL+FRu4sVsE4MkFto82SDWBqlrjRAO9P6Y57KzcDXSY0nyFUZtwiCfVg b2mjrl4q4OLmH7aSh8M7iY0rgfTd/CXShR9Ri0xAFswJqtPxPHQN/NUVhruupodkhn0c6x oYdEFvzoCAixJfahsTSiZr8Mml/KeI2LfpZN9xZrFJIMIgDyNYZqXebQLR2AjQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793166763; b=aAf7mgdEHwKJfZlf5lfJytOeiyGsuxNMekgXbrfkeqBMF6gJj7jMPwB+Z1WAQgPs4lo/vm jKCX634js+YiR6ZGnfEJfWueuLKLWSmrb8y/f2neYeu4J7rxiHmrpNIjUI7eHI4zRkR0SX X2jvHahgQpVlRdQSiokkCyx5yIyHSCJc+MgfWBL5UqeDc+SyEBJ4fdeg5biuK6aSfxaOnv vZfCWGsLHOA9B4iyj+C5fP6CEO6z7dPBe/sJkMC9t3lMzJIjH90dm5ENr9iNmOKcR2q4Ro /gktO5iYjihfYBrPF+VAXUZj4XxN6ltfn0QFFRdYrTV7HoepL9CQ1GPE4MbCbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaQxoUFIsizEY7d5rpn9D1xWXVGwLxM82wDMEmd3mbY=; b=JVmI2ju+QtCYRgNmYLQ7O6pOx/Q9FMr8+GXQLaXF1kGiYYcvDxWguadIhI3Z5eI5Lu7ySm hYRHco0LUr0WkitJHNjyovAiFOO0kt59benUY5Dw2MxgQegkt5UUBYbQkzZ1lpDWvUrB77 /0zThxIdCil9iPesLYkDCjApnaciKfM8PweGPWgOKWqFHg5GWGe/OG6bZ+naWH/MroFbv9 LHyTbjVAkb8NpAWn+U2yGrSTfKz9Wx8H56b8m9Fu+cPT/HPJ3/Y4aJry8lhJKbiBsEaeS4 lBbrT7/JRY+cMTtlmgp2in2XrlqcIudKUzlsw8uVJTVFqVyC0IvFzIwYSSdvJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jDxNC264Tzw6r for ; Wed, 28 Oct 2026 05:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3479a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 05:52:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Colin Percival Subject: git: 1be967ac4e2d - stable/15 - newvers.sh: Report -dirty also with staged changes List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1be967ac4e2d981e5a8c9b4abb17b26ec3fb380f Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 05:52:43 +0000 Message-Id: <6ae18dab.3479a.63793e0e@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1be967ac4e2d981e5a8c9b4abb17b26ec3fb380f commit 1be967ac4e2d981e5a8c9b4abb17b26ec3fb380f Author: Ed Maste AuthorDate: 2026-10-14 12:42:40 +0000 Commit: Colin Percival CommitDate: 2026-10-28 05:46:31 +0000 newvers.sh: Report -dirty also with staged changes We add -dirty to the uname version string if the tree does not match the reported hash. Previously, staged but uncommitted changes were ignored. Noted by naddy@ in D60606. Reviewed by: cperciva, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60722 (cherry picked from commit 617c700abae7aba74777fca137458395936f5053) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index dae4cab3f3d1..543d63114af3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -179,7 +179,7 @@ findvcs() git_tree_modified() { - ! $git_cmd "--work-tree=${VCSTOP}" -c core.checkStat=minimal -c core.fileMode=off diff --quiet + ! $git_cmd "--work-tree=${VCSTOP}" -c core.checkStat=minimal -c core.fileMode=off diff --quiet HEAD } got_tree_modified()