From 37a8201c2bb803164cfbe9ac451f268d8b93d3e6 Mon Sep 17 00:00:00 2001
From: mhucka <mhucka@google.com>
Date: Tue, 7 Apr 2026 17:23:09 +0000
Subject: [PATCH 1/3] Fix makefile indentation

Don't set indent_size = 4 for makefiles.

Also, set a default for the tab_width.
---
 .editorconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e11d23203..85b1dc00a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,9 +23,10 @@ root = true
 charset = utf-8
 indent_style = space
 insert_final_newline = true
+max_line_length = 80
 spelling_language = en-US
+tab_width = 8
 trim_trailing_whitespace = true
-max_line_length = 80
 
 [{BUILD,*.BUILD,*.bzl,*.bazel,.bazelrc,WORKSPACE}]
 indent_size = 4
@@ -38,7 +39,6 @@ indent_size = 4
 
 [{Makefile,makefile,*.mk}]
 indent_style = tab
-indent_size = 4
 
 [{*.cc,*.h}]
 indent_size = 2

From b97c60f5954356f116dd56dd2c920057ea0169a8 Mon Sep 17 00:00:00 2001
From: mhucka <mhucka@google.com>
Date: Tue, 7 Apr 2026 17:57:47 +0000
Subject: [PATCH 2/3] Only set tab_width for Makefiles

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 85b1dc00a..4636c2f04 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,7 +25,6 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 80
 spelling_language = en-US
-tab_width = 8
 trim_trailing_whitespace = true
 
 [{BUILD,*.BUILD,*.bzl,*.bazel,.bazelrc,WORKSPACE}]
@@ -39,6 +38,7 @@ indent_size = 4
 
 [{Makefile,makefile,*.mk}]
 indent_style = tab
+tab_width = 8
 
 [{*.cc,*.h}]
 indent_size = 2

From 4e5f7e8e9505fefcf0d497b308d5cf90d3df4a87 Mon Sep 17 00:00:00 2001
From: mhucka <mhucka@google.com>
Date: Fri, 10 Apr 2026 19:17:23 +0000
Subject: [PATCH 3/3] Overhaul settings

Use the latest approach from our template repo
---
 .editorconfig | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 4636c2f04..36e916f3b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,23 +21,19 @@ root = true
 # the same settings and need to be updated if changes are made to this file.
 [*]
 charset = utf-8
+indent_size = 4
 indent_style = space
 insert_final_newline = true
 max_line_length = 80
 spelling_language = en-US
 trim_trailing_whitespace = true
 
-[{BUILD,*.BUILD,*.bzl,*.bazel,.bazelrc,WORKSPACE}]
-indent_size = 4
-
-[{CMakeLists.txt,*.cmake}]
-indent_size = 4
-
-[Dockerfile]
-indent_size = 4
+[{COMMIT_EDITMSG,MERGE_MSG,SQUASH_MSG,TAG_EDITMSG}]
+max_line_length = 72
 
 [{Makefile,makefile,*.mk}]
 indent_style = tab
+indent_size = 8
 tab_width = 8
 
 [{*.cc,*.h}]
@@ -47,15 +43,8 @@ indent_size = 2
 indent_size = 2
 
 [*.py]
-indent_size = 4
 # This is the Black default line length.
 max_line_length = 88
 
-[*.sh]
-indent_size = 4
-
-[*.toml]
-indent_size = 4
-
 [{*.yaml,*.yml,*.cff}]
 indent_size = 2