[Scummvm-git-logs] scummvm master -> e557a339a9831e7a1700ee08e3bbd229ce141cce

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e557a339a9 ALL: Force CRLF line-endings for Windows .bat files


Commit: e557a339a9831e7a1700ee08e3bbd229ce141cce
    https://github.com/scummvm/scummvm/commit/e557a339a9831e7a1700ee08e3bbd229ce141cce
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-23T11:03:49+03:00

Commit Message:
ALL: Force CRLF line-endings for Windows .bat files

Subtle parsing problems with labels can happen if Windows batch files
are checked out with Unix LF line-endings.

Changed paths:
    .editorconfig
    .gitattributes


diff --git a/.editorconfig b/.editorconfig
index 94054d769e4..b4996a80cde 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,5 +6,8 @@ insert_final_newline = true
 vc_generate_documentation_comments = doxygen_slash_star
 end_of_line = lf
 
+[*.bat]
+end_of_line = crlf
+
 [*.lingo]
 charset = macroman
diff --git a/.gitattributes b/.gitattributes
index 198366cb20d..b71c8fd4d87 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,7 @@
 /po/*.po encoding=utf-8
 *.lingo	encoding=MacRoman
 /engines.awk eol=lf
+*.bat text eol=crlf
 *.cpp text eol=lf
 *.h text eol=lf
 *.hpp text eol=lf