From 62a9f32344d915769dcb5ed2575c932f02913852 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Mon, 13 Mar 2017 16:15:28 -0700 Subject: [PATCH] init: Remove custom clang-format Use a symlink to .clang-format-4 from the parent directory now that we have it, instead of the custom .clang-format in this directory. The changes between these files are, Old: ConstructorInitializerAllOnOneLineOrOnePerLine: false TabWidth: 8 New: ConstructorInitializerAllOnOneLineOrOnePerLine: true TabWidth: 4 There is no reason to keep a custom .clang-format for these two changes, and setting ConstructorInitializerAllOnOneLineOrOnePerLine to true will be beneficial. Test: Run clang-format and see that its output is sane Change-Id: I5b357949eb02a60577cf57a783c0a80997b24e75 --- init/.clang-format | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) mode change 100644 => 120000 init/.clang-format diff --git a/init/.clang-format b/init/.clang-format deleted file mode 100644 index 48d423f71..000000000 --- a/init/.clang-format +++ /dev/null @@ -1,14 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -BinPackArguments: true -BinPackParameters: true -ColumnLimit: 100 -ConstructorInitializerAllOnOneLineOrOnePerLine: false -IndentWidth: 4 -Standard: Auto -TabWidth: 8 -UseTab: Never -DerivePointerAlignment: false -PointerAlignment: Left -... diff --git a/init/.clang-format b/init/.clang-format new file mode 120000 index 000000000..1af4f51dd --- /dev/null +++ b/init/.clang-format @@ -0,0 +1 @@ +../.clang-format-4 \ No newline at end of file