Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EOL problem with files in git repo #48

Closed
slodki opened this issue Dec 8, 2018 · 3 comments · Fixed by #49
Closed

EOL problem with files in git repo #48

slodki opened this issue Dec 8, 2018 · 3 comments · Fixed by #49

Comments

@slodki
Copy link
Contributor

slodki commented Dec 8, 2018

There are multiple text files in the repo stored with CRLF.

From man gitattributes:

eol
This attribute sets a specific line-ending style to be used in the working directory. It enables end-of-line conversion without any content checks, effectively setting the text attribute. Note that setting this attribute on paths which are in the index with CRLF line endings may make the paths to be considered dirty. Adding the path to the index again will normalize the line endings in the index.
[...]
Note
When text=auto conversion is enabled in a cross-platform project using push and pull to a central repository the text files containing CRLFs should be normalized.

Please verify before each commit that text files are normalized (EOL=LF only).

See moneymanagerex/moneymanagerex#1890 for affected files.

@utelle
Copy link
Owner

utelle commented Dec 8, 2018

I'm a bit puzzled, how this could and can happen. Shouldn't the file .gitattributes handle this automatically?

@utelle utelle closed this as completed in #49 Dec 8, 2018
utelle added a commit that referenced this issue Dec 8, 2018
Fix #48: normalize EOL for text files in repo (replace CRLF with LF)
@slodki
Copy link
Contributor Author

slodki commented Dec 9, 2018

This can be related to folowing warning from man gitattributes:

eol
This attribute sets a specific line-ending style to be used in the working directory. It enables end-of-line conversion without any content checks, effectively setting the text attribute. Note that setting this attribute on paths which are in the index with CRLF line endings may make the paths to be considered dirty. Adding the path to the index again will normalize the line endings in the index.

@utelle
Copy link
Owner

utelle commented Dec 9, 2018

As far as I understood it, the issue should affect only files having the "wrong" line ending that were added before .gitattributes was used to define the default eol behaviour. That is, it shouldn't occur anymore in the future.

Thanks for cleaning up the files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants