From 0f40ddd957999121a8c57ed05fee3c61871125ca Mon Sep 17 00:00:00 2001
From: Yuval Peress <peress@google.com>
Date: Wed, 18 Jan 2023 22:27:57 -0700
Subject: [PATCH] tools: Fix clang-format values

According to the clang-format documentation some values in our
.clang-format are incorrect. See:

- https://clang.llvm.org/docs/ClangFormatStyleOptions.html#allowshortblocksonasingleline
- https://clang.llvm.org/docs/ClangFormatStyleOptions.html#sortincludes

Signed-off-by: Yuval Peress <peress@google.com>
---
 .clang-format | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.clang-format b/.clang-format
index 0fbebd89184..4d31ab6ad1e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,7 +12,7 @@
 ---
 BasedOnStyle: LLVM
 AlignConsecutiveMacros: AcrossComments
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -79,7 +79,7 @@ IndentCaseLabels: false
 IndentWidth: 8
 InsertBraces: true
 SpaceBeforeParens: ControlStatementsExceptControlMacros
-SortIncludes: false
+SortIncludes: Never
 UseTab: Always
 WhitespaceSensitiveMacros:
   - STRINGIFY