From nobody Sun Jun 7 15:42:42 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 4gYKF662jFz6gr26; Sun, 07 Jun 2026 15:42:50 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gYKF65M1Dz3p4q; Sun, 07 Jun 2026 15:42:50 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780846970; 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: in-reply-to:in-reply-to:references:references; bh=+bWtwti2nThGYM2YuqfjoaY/JkPSW42N0hh3+WmPx4g=; b=QWKt1jQfD8GLkUF0fjNet1klemTyL+9GpxqjSs7RB1Z8FAbRPVZYkzWxbtIFVnehO/CtoR V8gDiZJP/imO2KXBZlMKyPpCxvXxj+6NRAFvKnryVw/7sXcn2bZVAp/Mq0bvTJsoj5aHjm qYrH5otMBIJREHCfh+vkS4j0exTd/hm3jWkzBwdggSOfM9IJIjEJkN/PlA2HxmvJTgrAoc SpyJwwo5/VCzK/3YZU8Uiyi+SZO6vq/RK/Y8tFQ2emPLm2BqaZtnIWIbDK2LKdFuby1add NEQzUH0cEhnL3fJTItpzhSZw+Mk1iZqIgCSSNENxW3HTubwKxhmdy2anbqhx2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780846970; a=rsa-sha256; cv=none; b=yS0YWpVS0j7OwtrjGZj4qWFbyzJN4yepYgphNhB6Jncc5SoxkaU7syP5Bk2iNXt4RWb2UR OOoW/YBS5+zzJMWkbEQWONhH+RYIihryzmN+oGXl9jayOUDrBQFUhZq5qqLITDDSJYyUf0 6cBzReZcqbvoxRJD1W9kgzep7SbdICUeNcHQ7EiUP6yq8Zz5GYLWjKX+Jc5bxJGrnGzDPO x/pkv8GaU/IQu5XZQKZKr/4UnUMrNpZ8sARTDUhgW2A9EiHMlSAu+ArLgXyfU+alOAXVl1 uc4Q+No9NZCV/eOVfbV8B2FGEy7VZHiGP5iuQNTRrp6n4mOEX6ODfUbjNmk1xQ== 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=1780846970; 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: in-reply-to:in-reply-to:references:references; bh=+bWtwti2nThGYM2YuqfjoaY/JkPSW42N0hh3+WmPx4g=; b=n2HePzHxvIfk1N8LN4pcHTk5ESyYq9zl2caHCuuHz/OoZb9Nq3FP2qJE0G44X31S3i4Qq6 7AH94R524zojf9iXjtKar2cD5HSWyEXWojIqOrslVugYj8KOle7syvto1VAGpUDex0xQmm 2KFi1YZm9O4F+PYehaYL8v6M3YafX1BSQJn66MRZVYC75CgE1jyj9e3IYfRvklHJJ6cHw6 8067yZ1QrvQks8MYhfX9y0Yi8B6qCqFBdxDLjSW3X+7rgJiU3a3mdJ3N559Fa/0GepnEnZ sVVqz6flGKtYu4Vrd2F2PQSN8GczAk0vgn0abxEU7xIA8cOF1ajVeZZJku4eKw== Received: from ravel.localnet (lfbn-nic-1-328-19.w90-116.abo.wanadoo.fr [90.116.162.19]) (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 did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gYKF60mMjzGZg; Sun, 07 Jun 2026 15:42:49 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 7487932f4fbc - main - assert.h: style(9): Space after #define, between #endif and comment Date: Sun, 07 Jun 2026 17:42:42 +0200 Message-ID: <1989701.GETTdP9EZa@ravel> In-Reply-To: <711a1680-9b9f-4b2a-a97f-d1cc9523c5f6@FreeBSD.org> References: <6a2166aa.22490.59890f0d@gitrepo.freebsd.org> <711a1680-9b9f-4b2a-a97f-d1cc9523c5f6@FreeBSD.org> 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: multipart/signed; boundary="nextPart54025349.rt4x2z8vUf"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart54025349.rt4x2z8vUf Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: John Baldwin Date: Sun, 07 Jun 2026 17:42:42 +0200 Message-ID: <1989701.GETTdP9EZa@ravel> In-Reply-To: <711a1680-9b9f-4b2a-a97f-d1cc9523c5f6@FreeBSD.org> MIME-Version: 1.0 Hi John, I'm sorry that this caused complications in downstreaming changes. Nevertheless, some of your words look like quite the surprise. > > commit 7487932f4fbc5a71231d3b1fc93d160253f38c83 > > Author: Olivier Certner > > AuthorDate: 2026-06-02 10:01:05 +0000 > > Commit: Olivier Certner > > CommitDate: 2026-06-04 11:49:26 +0000 > >=20 > > assert.h: style(9): Space after #define, between #endif and comment > > =20 > > style(9) still allows TAB after #define but this is a historical > > artifact and by far the minority of uses cases. Going forward, we= would > > like to promote the use of a single space, as it allows alignment = to > > survive line prefixing (such as in diffs). >=20 > It is not "by far the minority" and is still widely used. Excluding cont= rib it > is still about 1/3 of the cases in the tree. I had done some statistics and, excluding contrib, I got a number much clos= er to 1/4 than 1/3 (165316 against 439359 on main in the middle of this wee= k). Maybe "by far the minority" was too strong. It remains that statistic= s are unequivocally biased towards spaces. > This was not worth yet another commit to this file absolutely destroying = git > blame. This file has seen a series of 6 commits in the past days, of which only th= e last one is mine, and importantly it only changed lines already touched b= y the preceding commits. Certainly, one more commit is always one more annoyance, but is "absolutely= destroyed git blame" an adequate characterization? > Please cool it a bit on going on holy wars over pushing for changes to > historical style and then committing style-only changes. Changes I've proposed have always been through srcmgr@ (I'll specifically c= ome back below to the "Going forward, we would like to promote (snip)" quot= e from the above commit message). There have been only a few of them, of which only one was enacted (see chan= gelog for style(9)), and in particular it was approved by you. It is about: "Encourag(ing) style changes when doing significant modificati= ons" (full commit at https://cgit.freebsd.org/src/commit/?id=3Daf2c7d9f6452= f2281a). Let me quote the relevant part: """ On the other hand, when a significant portion, usually about a half, of som= e logical unit of code, be it a function, group of functions, file or group of files, is going to be modified, developers are encouraged to amend the style of the whole unit as described in this document. In this case, style changes to otherwise unmodified code should be committed separately. Style-only commits should be added to the file .git-blame-ignore-revs at the top of the source repository to hide them from =E2=80=98git blame=E2=80=99. """ assert.h, as of 439710cf003b (last commit before my change), is 115 lines, = actually only 80 if you omit the license block. Commits since May 30th cha= nged 46 of these (only counting the final result, not intermediate churn). = That looks like about a half. Certainly, it would have been better that the style changes I finally made = had been done as part of the actual code changes and not a separate commit.= And, actually, they initially were, but were then reverted because of an = objection that the historical style was TABs. That's the only reason that = prompted me to intervene: That the argument used was in contradiction with = style(9) (and had been since 2021). If that was only for the TABs, I would= not have done anything (TABs are not forbidden there). By contrast, I tho= ught it important to counter propagation of false statements regarding styl= e(9), and acted promptly so that my own commit would be close to the other = ones temporally so as to minimize downstreaming disturbance (which is the s= pirit of the quoted text above). =46inally, prior to committing, my change was put into review and approved,= in particular by imp@. The "Going forward, we would like to promote the u= se of a single space, as it allows alignment to survive line prefixing (suc= h as in diffs)" statement in the above commit message was more about my own= opinion initially, but then I received some backing by imp@, and in the en= d kept that sentence (perhaps I shouldn't have). The next natural step is = to raise that potential change (encouraging a single space in new code; not= even making it compulsory) at some next srcmgr@ meeting. "Holy wars"? Regards. =2D-=20 Olivier Certner --nextPart54025349.rt4x2z8vUf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmolkXIACgkQjKEwQJce JicyqxAAm80fjwBpnEFhoQzxIn5tUGfuojQAOrS/gJaoSnpRnfnUkkuGB7zQD4FK CJscIL/HsasU+OuW52n5Cs/rcyKpN+iLf2HIh2unns3aJaQ7qBq+2MxviqxHhTJV r/M5k4gK30jaGTi050XriZEIX/vO1gwfwugElDa8BspplEO3Bp7t1npSyrZlYwc0 fxjUnxVQ1mmykNJPdbeLo3APvC6qpFqwnK028mtq8Q8OwIAd14979oNWvFvrwUSX BohdDOmBB6R9uJL4RM958ArOVf0nEDDIMxqgpE9on8imckuK0R+qgN/pyuHajqgI kkwWFRmd+Mg5Mwu2/JmDSIpZinHhyGCHmapQLy/N+EuUvCBixh/GzPTBMkAUKJwO hmlTwulVa1XMMmJTb4cerorcoLhoVCvd94Shlg8ytbmJSB8O+XOfTbGi5OObOkwa wlhZI7xxDGUqANPW6yBAsr/GRfiY89YL5LisOcbdle6Nbth8/PM19+mmoAzdGhRb CshPUflZsvcTKwZQuWmw0dFVDotcugW4PgvnJk2z/hTkRAOpF1X00l9t91+bdfdm CnbJfMho7J9CfqOLrMMqEa/EOe/iDhdrIOsgNuM5ieN492+ZG9qaD8S3GAhypcwe gfoLuf5Nj+txtz3D8EIP2hIGY+ADd68PHvElnqVOY2KaX1MaHII= =HxRe -----END PGP SIGNATURE----- --nextPart54025349.rt4x2z8vUf--