diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-10-09 01:03:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-09 12:34:15 +0300 |
| commit | b548d698a0e42d28614acb6a0792d7cfbe7ddef4 (patch) | |
| tree | acbe4154d852f90d2dc186c1439d0184e37a1161 | |
| parent | 6f9beef335de5baff72e146a8af9754973d598e4 (diff) | |
editorconfig: indicate settings should be kept in sync
Now that we have two places where we set code formatting settings,
.editorconfig and .clang-format, it's possible that they could fall out
of sync. This is relatively unlikely, since we're not likely to change
the tab width or our preference for tabs, but just in case, add comments
to both files reminding future developers to keep them in sync.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .clang-format | 2 | ||||
| -rw-r--r-- | .editorconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format index 12a89f95f9..de1c8b5c77 100644 --- a/.clang-format +++ b/.clang-format @@ -6,6 +6,8 @@ # Use tabs whenever we need to fill whitespace that spans at least from one tab # stop to the next one. +# +# These settings are mirrored in .editorconfig. Keep them in sync. UseTab: Always TabWidth: 8 IndentWidth: 8 diff --git a/.editorconfig b/.editorconfig index 8667740e1d..42cdc4bbfb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,6 +2,8 @@ charset = utf-8 insert_final_newline = true +# The settings for C (*.c and *.h) files are mirrored in .clang-format. Keep +# them in sync. [*.{c,h,sh,perl,pl,pm}] indent_style = tab tab_width = 8 |