Imported From: https://issues.scala-lang.org/browse/SI-9472?orig=1
Reporter: @SethTisue
Affected Versions: 2.11.7
See #3101

@SethTisue said:
See discussion at scala/scala#4744. Currently we are leaning towards simply recommending that people working in the Scala repo on Windows check out source files using LF line endings.

@retronym said:

 check out source files using LF line endings.

Nitpick: they should checkout with unaltered line endings. Some files in our repo have CRLF line endings:

⚡ file src/compiler/scala/tools/ant/templates/tool-windows.tmpl
src/compiler/scala/tools/ant/templates/tool-windows.tmpl: ASCII English text, with CRLF line terminators

@som-snytt said:
My aliases on cygwin always included

-Dline.separator=$'\n'

to help mitigate one form of mixed line endings.

@martijnhoekstra said:
A better solution than to rely on manual instruction could be to change the normalisation in .gitattributes

Currently it has

• text=auto

which will set all files to auto text, meaning on check out it converts all line endings to core.eol, and on check in convert all line endings to lf. For anyone who has core.eol set to anything but lf that would spell trouble.

I'm no git wizard, but shouldn't changing that line to

• eol=lf

do the trick? If it does, it seems like a better solution than to tell all windows users to config their core.eol for this repo.

In response to Jasons nitpick: The *-windows.tmpl files (as well as .cmd and .bat) are already set to eol=crlf in .gitattributes

@SethTisue said (edited on Sep 17, 2015 11:57:56 AM UTC):
Yes, I agree that eol=lf in .gitattributes seems like the way to go. (I have been looking into this as well and arrived at the same conclusion.) I've been waiting to put together a pull request until I can verify that all tests are passing on Windows, so if any additional changes are needed, I can include them too.

@SethTisue said:
It looks to me like eol=lf supplements rather than replaces text=auto. The former affects working copies, the latter affects commits.

@SethTisue said:
scala/scala#4770

@SethTisue said:
4770 was merged, but closing this ticket as "wontfix" since the PR doesn't make the tests robust to different eol styles, rather, it attempts to enforce that people have the right style in their checkouts