From aeebb49b7cfeff525fafe8ae105e091c923193fb Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Tue, 18 Nov 2025 10:28:36 -0600 Subject: [PATCH] Update .editorconfig and .gitattributes for postgresql.conf.sample. This commit updates .editorconfig and .gitattributes in preparation for a follow-up commit that will modify this file to use spaces instead of tabs. Reviewed-by: Tom Lane Reviewed-by: Chao Li Discussion: https://postgr.es/m/aReNUKdMgKxLqmq7%40nathan --- .editorconfig | 6 ++++++ .gitattributes | 1 + 2 files changed, 7 insertions(+) diff --git a/.editorconfig b/.editorconfig index e20d15d4533..0ee9bd28ac4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -85,6 +85,12 @@ insert_final_newline = true indent_style = unset tab_width = unset +[src/backend/utils/misc/postgresql.conf.sample] +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +tab_width = unset + [*.out] indent_style = unset indent_size = unset diff --git a/.gitattributes b/.gitattributes index 4e26bbfb145..00092168393 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,6 +19,7 @@ README.* conflict-marker-size=48 *.data -whitespace contrib/pgcrypto/sql/pgp-armor.sql whitespace=-blank-at-eol src/backend/catalog/sql_features.txt whitespace=space-before-tab,blank-at-eof,-blank-at-eol +src/backend/utils/misc/postgresql.conf.sample whitespace=space-before-tab,trailing-space,tab-in-indent # Test output files that contain extra whitespace *.out -whitespace