From nobody Sun Feb 22 03:44:30 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 4fJVGk3BMmz6Srl5 for ; Sun, 22 Feb 2026 03:44:30 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJVGk2J4wz3Qp4 for ; Sun, 22 Feb 2026 03:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731870; 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=xE9kMcTmvq1/mhKAfIKRDB4sYEp2JcyaRt28rqqzLXU=; b=Zj9qMSKo9n8k+Xzy8DU2dHvxmmC3mto5NexEBSvwIypgAb5RV3nghtafOwdxax4V+9ZSyx T7LVl4Iny2NqfeLvvJQyYXSe5GyLaEypuIF8O1brj921bbUNTswmwCMIXi59/TEq9FO7h0 wwBndhIAZ6X6To2CbvhDrXcTLXvAh7VK7Hh5ZztRQsU6O9NBXtZtpOs2J8XqZncfRU4Lyq 6LPAiyO8ti2bSFL+sR2S5UJtWb8Fw2WhXIiYa3OPoYNZmStbabpXyvONGUD/EzemGW1G5y NFHjbL/goi23VS7E/PxlEOmmA0tqpG4/ReVU8hvaqAF3c+jrAx4ueiIr+i5CJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731870; a=rsa-sha256; cv=none; b=x+PqvNPv03Debvd91TBs3nCiDiqUmuUIZHUqa28pY0mZ+mNbqBjkepk/43Fz3tyVlTzDqN KBiqE8OkT9GNOwJJZROw4aZrGHyaaTRNjicTlJ2nzyJfgWY8sxcud1hikpVKwAxS1VAb3G dnqCzWidfXyBlQKsyPJmN51db32lz8a7+B7Q11Vpf2NxWIRMnvbhNAEg0T2L9cLFJYhUXZ DpFoOhe4Mpwlp3ZJwfVX++I9zCf1fz/fbZDyOGqvUvNcax9TA0iJ7FDPp32Tk+oNL3a9EZ QPNezK3htO9n01tWkuIlISPJd1hDWjq8tSw2zF1KL/ASG29WRr1+D0qcR0P/AQ== 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=1771731870; 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=xE9kMcTmvq1/mhKAfIKRDB4sYEp2JcyaRt28rqqzLXU=; b=cY/u8SrAebw43yqEXqM6WxQ+a8wlVyUeTHdYdnSLXT0Et9gERTanXv6xX7A1nNyF0H4z5t nyM30hmfz4Q5NB2xCdghUGn0W7TjKqFXUoHvcM6r/zSB4VTFnKtgX+YPjVP6s4wfpEfbHN w/3+I6ya7cq63ANU+d0ICB4IA3IqNpBgep3WXT5QDtaltmx0Q6c7iRqiSPKvoxel/U/jAA cMv7xlX1hISwp9Y2G4bP/sVWPWTCoQUKOSE+mYS0Y/uWdScjBkjLzzuAE1KheSkxkub0RM NxBXgb1c/0UjfN5qYXU3BuVPGPYM1to4M2I5PQ6JzwPj/mVhtaNJf1R6wek8jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJVGk1vZbzBwK for ; Sun, 22 Feb 2026 03:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 7111f124b8f8 - stable/15 - clang-format: adjust to sort C++ headers per style(9) 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7111f124b8f8398b64db9280c5d090c7e45bef9b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:44:30 +0000 Message-Id: <699a7b9e.21f8e.7862b5a0@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7111f124b8f8398b64db9280c5d090c7e45bef9b commit 7111f124b8f8398b64db9280c5d090c7e45bef9b Author: Enji Cooper AuthorDate: 2026-01-31 04:14:07 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:44:24 +0000 clang-format: adjust to sort C++ headers per style(9) Many standard C++ headers do not have the .h file extension: some, such as `iostream`, lack it; others have a .hpp file extension. Moreover, some projects (like ATF/Kyua) also contain .ipp files, which are C++ "interface" files. Relax the regular expression to ensure that non-traditional C "system" headers, C++ headers, etc, with angle brackets are sorted before "local" headers. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54401 (cherry picked from commit ab9b04736945537743eb0624ead7a4fa4b960783) --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 3d436fa0b35d..efe9f1202bde 100644 --- a/.clang-format +++ b/.clang-format @@ -151,10 +151,10 @@ IncludeCategories: - Regex: '^<(fs|nfs(|client|server)|ufs)/' Priority: 8 SortPriority: 80 - - Regex: '^<[^/].*\.h' + - Regex: '^<[^/].*' Priority: 9 SortPriority: 90 - - Regex: '^\".*\.h\"' + - Regex: '^\".*\"' Priority: 10 SortPriority: 100 # LLVM's header include ordering style is almost the exact opposite of ours.