From 01fa49b6180f0430dd2f91b8c863c4d0299a55c6 Mon Sep 17 00:00:00 2001 From: Thomas Sapelza Date: Fri, 4 Sep 2026 15:18:57 +0200 Subject: [PATCH] Enforce LF line endings with .gitattributes Two files in #60 were committed with CRLF although .editorconfig asks for LF. Git now normalizes every text file to LF on commit and checks it out as LF on every platform, so the editor setting can no longer be bypassed. gradlew.bat keeps CRLF in the working tree. jar and png files are marked binary. Also fix the linguist-generated pattern: the jOOQ sources live under generated/src/, not src/generated/, so the old pattern matched nothing. --- .editorconfig | 3 +++ .gitattributes | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 838d8cf..d1871de 100644 --- a/.editorconfig +++ b/.editorconfig @@ -20,5 +20,8 @@ indent_size = 2 [Makefile*] indent_style = tab +[*.bat] +end_of_line = crlf + [src/main/resources/default_banner.txt] insert_final_newline = false diff --git a/.gitattributes b/.gitattributes index ec83a67..a7f5e57 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,13 @@ -src/generated/** linguist-generated +# Line endings: store LF in the repository and check out LF on every platform. +# Git detects binary files itself through text=auto. The entries below are the exceptions. +* text=auto eol=lf + +# Windows batch files need CRLF in the working tree. +*.bat text eol=crlf + +# Binary files +*.jar binary +*.png binary + +# GitHub: mark the jOOQ generated sources as generated (collapsed in diffs, excluded from language statistics). +generated/src/** linguist-generated