From e9b35e7a3ea5a4a456bc7147d12bea0530e52db1 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Fri, 9 Dec 2022 16:26:10 +0000 Subject: [PATCH] gitattributes: json and yaml files LF line endings Always check-out / check-in json and yaml files with LF line endings. This will also solve a few unit tests on Windows, in which the expectation is that marshalled objects match the the content written in a few yaml or json files. On Windows, these files may be checked out with CRLF line endings, which causes the tests to fail. --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 022e4cde51e..cee8bb8f2ad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ +# Always check-out / check-in files with LF line endings. +* text=auto eol=lf + hack/verify-flags/known-flags.txt merge=union test/test_owners.csv merge=union