summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-31 17:40:34 (GMT)
committerBrad King <brad.king@kitware.com>2018-06-01 13:52:02 (GMT)
commit523c443d135f6474cf5a9d0372b3cc364fc7ebe5 (patch)
tree82f22000589d6ded60d2c325b221c5290cda3d3d /.gitattributes
parenteb7ec19c1c639e91b812763ead3a56e97d20aec4 (diff)
downloadCMake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.zip
CMake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.tar.gz
CMake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.tar.bz2
clang-format.bash: update to clang-format-6.0
Update `.clang-format` with configuration to make the 6.0 format as close as possible to what 3.8 produced before. Then revise the style: * Indent preprocessor directives (a feature new since 3.8) * Add a newline and indentation before inheritance `:` and `,` Rename the Git attribute identifying the format to include the clang-format version number: `format.clang-format-6.0`. This will aid external infrastructure in knowing what version of the tool to run.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index fd878ac..d6fd5d6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,11 +2,11 @@
.hooks* export-ignore
# Custom attribute to mark sources as using our C code style.
-[attr]our-c-style whitespace=tab-in-indent format.clang-format
+[attr]our-c-style whitespace=tab-in-indent format.clang-format-6.0
# Custom attribute to mark sources as generated.
# Do not perform whitespace checks. Do not format.
-[attr]generated whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format
+[attr]generated whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format-6.0
bootstrap eol=lf
configure eol=lf