From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: Karthik Nayak <karthik.188@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: [PATCH v2 1/5] clang-format: fix indentation width for preprocessor directives
Date: Tue, 30 Jul 2024 09:24:33 +0200 [thread overview]
Message-ID: <c33ad700d68b5d8b5940dd803d116ec19bb75c7e.1722323818.git.ps@pks.im> (raw)
In-Reply-To: <cover.1722323818.git.ps@pks.im>
[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]
In [1], we have improved our clang-format configuration to also specify
the style for how to indent preprocessor directives. But while we have
settled the question of where to put the indentation, either before or
after the hash sign, we didn't specify exactly how to indent.
With the current configuration, clang-format uses tabs to indent each
level of nested preprocessor directives, which is in fact unintentional
and never done in our codebase. Instead, we use a mixture of indenting
by either one or two spaces, where using a single space is somewhat more
common.
Adapt our clang-format configuration accordingly by specifying an
indentation width of one space.
[1]: <20240708092317.267915-1-karthik.188@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
.clang-format | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.clang-format b/.clang-format
index 16fd12253e..0b82f3c776 100644
--- a/.clang-format
+++ b/.clang-format
@@ -100,11 +100,13 @@ BreakStringLiterals: false
# Switch statement body is always indented one level more than case labels.
IndentCaseLabels: false
-# Indents directives before the hash.
+# Indents directives before the hash. Each level uses a single space for
+# indentation.
# #if FOO
-# # include <foo>
+# # include <foo>
# #endif
IndentPPDirectives: AfterHash
+PPIndentWidth: 1
# Don't indent a function definition or declaration if it is wrapped after the
# type
--
2.46.0.dirty
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-07-30 7:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 11:05 [PATCH 0/3] Documentation: some coding guideline updates Patrick Steinhardt
2024-07-24 11:05 ` [PATCH 1/3] Documentation: clarify indentation style for C preprocessor directives Patrick Steinhardt
2024-07-24 16:41 ` Junio C Hamano
2024-07-25 5:06 ` Junio C Hamano
2024-07-30 6:32 ` Patrick Steinhardt
2024-07-24 11:05 ` [PATCH 2/3] Documentation: document naming schema for struct-related functions Patrick Steinhardt
2024-07-24 11:42 ` Karthik Nayak
2024-07-24 13:12 ` Patrick Steinhardt
2024-07-24 16:50 ` Junio C Hamano
2024-07-24 16:56 ` Junio C Hamano
2024-07-30 6:41 ` Patrick Steinhardt
2024-07-24 11:05 ` [PATCH 3/3] Documentation: document difference between release and free Patrick Steinhardt
2024-07-24 11:46 ` Karthik Nayak
2024-07-24 13:11 ` Patrick Steinhardt
2024-07-24 14:30 ` Phillip Wood
2024-07-24 18:02 ` Junio C Hamano
2024-07-30 6:49 ` Patrick Steinhardt
2024-07-24 16:52 ` Junio C Hamano
2024-07-30 6:43 ` Patrick Steinhardt
2024-07-24 11:47 ` [PATCH 0/3] Documentation: some coding guideline updates Karthik Nayak
2024-07-30 7:24 ` [PATCH v2 0/5] " Patrick Steinhardt
2024-07-30 7:24 ` Patrick Steinhardt [this message]
2024-07-30 14:19 ` [PATCH v2 1/5] clang-format: fix indentation width for preprocessor directives Karthik Nayak
2024-07-30 7:24 ` [PATCH v2 2/5] Documentation: clarify indentation style for C " Patrick Steinhardt
2024-07-30 7:24 ` [PATCH v2 3/5] Documentation: document naming schema for structs and their functions Patrick Steinhardt
2024-07-30 7:24 ` [PATCH v2 4/5] Documentation: document idiomatic function names Patrick Steinhardt
2024-07-30 7:24 ` [PATCH v2 5/5] Documentation: consistently use spaces inside initializers Patrick Steinhardt
2024-07-30 20:55 ` [PATCH v2 0/5] Documentation: some coding guideline updates Junio C Hamano
2024-07-31 9:12 ` Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c33ad700d68b5d8b5940dd803d116ec19bb75c7e.1722323818.git.ps@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).