aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarthik Nayak <karthik.188@gmail.com>2024-07-23 10:21:06 +0200
committerJunio C Hamano <gitster@pobox.com>2024-07-23 09:56:49 -0700
commite3ea432528dc5bfcdff89c1b6afeaa6d423fd4ee (patch)
tree2509a4fe642fd1cb7f4ac2ec0792006dd3a79bfc
parent557ae147e6cdc9db121269b058c757ac5092f9c9 (diff)
downloadgit-e3ea432528dc5bfcdff89c1b6afeaa6d423fd4ee.tar.gz
clang-format: indent preprocessor directives after hash
We do not have a rule around the indentation of preprocessor directives. This was also discussed on the list [1], noting how there is often inconsistency in the styling. While there was discussion, there was no conclusion around what is the preferred style here. One style being indenting after the hash: #if FOO # if BAR # include <foo> # endif #endif The other being before the hash: #if FOO #if BAR #include <foo> #endif #endif Let's pick the former and add 'IndentPPDirectives: AfterHash' value to our '.clang-format'. There is no clear reason to pick one over the other, but it would definitely be nicer to be consistent. [1]: https://lore.kernel.org/r/xmqqwmmm1bw6.fsf@gitster.g Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.clang-format6
1 files changed, 6 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
index 3ed4fac753..5e128519bf 100644
--- a/.clang-format
+++ b/.clang-format
@@ -96,6 +96,12 @@ BreakStringLiterals: false
# Switch statement body is always indented one level more than case labels.
IndentCaseLabels: false
+# Indents directives before the hash.
+# #if FOO
+# # include <foo>
+# #endif
+IndentPPDirectives: AfterHash
+
# Don't indent a function definition or declaration if it is wrapped after the
# type
IndentWrappedFunctionNames: false