line ending issue (CRLF) inside repository

[paulvi]

Continue subtopic in #19 as separate issue

I wrote a program to investigate the line ending issues, and it appears there are a mixture of Linux- and Windows- style endings in the project. Things start to go wrong when merges are attempted AFAICS. This issue is a can of worms and I'm not sure really the right way forward, and I don't see any concensus on the net, .e.g. http://stackoverflow.com/questions/2825428/why-should-i-use-core-autocrlf-true-in-git

I don't remember about the value for core.autocrlf, I just remmeber that

• on git server line ending should be Linux style
• on Windows PC line ending should be Windows style

[satyagraha]

I think these two articles show the best way forward:

• http://stackoverflow.com/questions/170961/whats-the-best-crlf-handling-strategy-with-git
• https://help.github.com/articles/dealing-with-line-endings

It is required that:

• on Windows, .cmd files must have CRLF termination
• on Linux, .sh files must have LF termination

and it is not uncommon for a single project repo to have files of both these types. Therefore the approach using .gitattributes is likely to be the best. Thankfully, Eclipse correctly preserves the line ending style of any text file it encounters.

[paulvi]

👍 having configuration inside repository and not depend on git global setting is great.

[satyagraha]

Fixed in 1c3e5e6.