Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jun 2026 12:57:50 +0000
From:      Brooks Davis <brooks@freebsd.org>
To:        Olivier Certner <olce@freebsd.org>
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
Message-ID:  <aiF2ThdgI-5P7fX1@spindle.one-eyed-alien.net>
In-Reply-To: <6a2166aa.22490.59890f0d@gitrepo.freebsd.org>

index | next in thread | previous in thread | raw e-mail

On Thu, Jun 04, 2026 at 11:51:06AM +0000, 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 <olce@FreeBSD.org>
> AuthorDate: 2026-06-02 10:01:05 +0000
> Commit:     Olivier Certner <olce@FreeBSD.org>
> 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).
>     
>     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).

Please add all three commits to .git-blame-ignore-revs.

-- Brooks


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aiF2ThdgI-5P7fX1>