From aea95ce9ce625b9d928b9386fad4b5687b738dc5 Mon Sep 17 00:00:00 2001 From: Austin Slominski Date: Tue, 19 Jul 2022 11:21:37 -0600 Subject: [PATCH 1/4] added gitattributes to disable autocrlf, addressing issue #1234 --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..3884c731df --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# prevents git from converting LF to CRLF, which causes issues +# when assembling example pages on Windows +* text eol=lf From a25a5d6bb88ba13cdaf51d510de26ba87e4eea3c Mon Sep 17 00:00:00 2001 From: Austin Slominski Date: Tue, 19 Jul 2022 14:57:20 -0600 Subject: [PATCH 2/4] made .gitattributes more specific, turning off line ending conversion for example js files --- .gitattributes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 3884c731df..d1a10e8de9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ +# Set default behaviour to automatically normalize line endings. +* text=auto + # prevents git from converting LF to CRLF, which causes issues # when assembling example pages on Windows -* text eol=lf +data/examples/**/*.js eol=lf From f38305d7fb1749e72b7c062b469c554eb264281c Mon Sep 17 00:00:00 2001 From: Austin Slominski Date: Wed, 20 Jul 2022 14:42:49 -0600 Subject: [PATCH 3/4] specifying binary files whose line endings should go unchanged --- .gitattributes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitattributes b/.gitattributes index d1a10e8de9..fb496858db 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,13 @@ # prevents git from converting LF to CRLF, which causes issues # when assembling example pages on Windows data/examples/**/*.js eol=lf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary +*.jpeg binary +*.mov binary +*.mp3 binary +*.mp4 binary +*.gif binary +*.webm binary From 22160e020d8e91bb5aa6e97c4506e9819345e22e Mon Sep 17 00:00:00 2001 From: Austin Slominski Date: Thu, 21 Jul 2022 10:33:17 -0600 Subject: [PATCH 4/4] added full list of binary files that occur in repo --- .gitattributes | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index fb496858db..1e23214d0b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,11 +6,19 @@ data/examples/**/*.js eol=lf # Denote all files that are truly binary and should not be modified. -*.png binary +*.ai binary +*.gif binary +*.ico binary *.jpg binary -*.jpeg binary *.mov binary *.mp3 binary *.mp4 binary -*.gif binary +*.ogg binary +*.ogv binary +*.otf binary +*.pdf binary +*.png binary +*.ttf binary +*.wav binary *.webm binary +*.zip binary