From 27981098723e341506261d6b2698b230251196b4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 4 May 2020 17:06:55 +0200 Subject: [PATCH] clang-format: set the IncludeBlocks setting to "Preserve" This was default in clang-format v7, but got changed to "Regroup" in v9. We prefer the old way for now and setting this explicitly makes it easier to support both versions. --- .clang-format | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.clang-format b/.clang-format index 2455d7127..724fcce0b 100644 --- a/.clang-format +++ b/.clang-format @@ -3,3 +3,6 @@ BasedOnStyle: Google # Google style has a default of 80 lines, but clang-format 7 disregards it in # a weird case in modtrezorio-fatfs.h. Setting it explicitly helps. ColumnLimit: 80 +# This setting differs between clang-format 7 and 9. +# Let's set it explicitly to v7 value +IncludeBlocks: Preserve