On 6/4/26 07:51, Olivier Certner wrote:
The branch main has been updated by olce:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7487932f4fbc5a71231d3b1fc93d160253f38c83
commit 7487932f4fbc5a71231d3b1fc93d160253f38c83
Author: Olivier Certner <[email protected]>
AuthorDate: 2026-06-02 10:01:05 +0000
Commit: Olivier Certner <[email protected]>
CommitDate: 2026-06-04 11:49:26 +0000
assert.h: style(9): Space after #define, between #endif and comment
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).
It is not "by far the minority" and is still widely used. Excluding contrib it
is still about 1/3 of the cases in the tree.
style(9) also has prescribed a single space between '#else' or '#endif'
and a comment recalling the guard since 2002.
So, commit 157c184689ea ("assert.h: Remove leading tabs for whitespace
consistency") was good, and in line with rules about whitespace changes
(since the file was heavily modified by surrounding commits).
This commit is thus basically a revert of 439710cf003b ("assert.h:
Revert "Remove leading tabs for whitespace consistency"), which extended
replacing spaces with TABs in the code introduced in the meantime (after
commit 157c184689ea).
Reviewed by: fuz, imp
Fixes: 439710cf003b ("assert.h: Revert "Remove leading tabs for
whitespace consistency")
MAC after: 3 days
Differential Revision: https://reviews.freebsd.org/D57391
This was not worth yet another commit to this file absolutely destroying git
blame. Please cool it a bit on going on holy wars over pushing for changes to
historical style and then committing style-only changes. It adds needless churn
to our tree, makes git blame harder (ignore-revs aside), and also adds pain to
downstreams who maintain forks of FreeBSD.
--
John Baldwin
