X Tutup
The Wayback Machine - https://web.archive.org/web/20210517140427/https://github.com/reactos/reactos/pull/18
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

Fix remaining text files stored with CRLF line endings in the tree. #18

Merged
merged 2 commits into from Oct 6, 2017

Conversation

@ColinFinck
Copy link
Member

@ColinFinck ColinFinck commented Oct 6, 2017

@gigaherz and @yagoulas found out that our Git still stores some text files internally with CRLF line endings, although all should be stored as LF and only checked out as defined in .gitattributes.

Based on https://stackoverflow.com/a/1511273, I have done another attempt to fix the remaining line endings.

Note that this also touches .diff/.patch files. @ThFabba had his doubts about changing line endings in patch files. As we check out our source files with OS-native line endings though, I think the same should apply for the corresponding patch files.

@ColinFinck ColinFinck requested review from ThFabba, gigaherz and yagoulas Oct 6, 2017
@ThFabba
ThFabba approved these changes Oct 6, 2017
Copy link
Member

@ThFabba ThFabba left a comment

My concern with patch files is because I've seen the patch tool refuse to apply things that had the wrong line endings. As usual, the Windows version seems to be lenient and allow CRLF or LF, while the Unix version will choke on CRs.
That said, as long as everything's consistent, things should work fine with the auto setting (the only broken case I can think of is checking out the repo on Windows, copying the patch file to a *nix machine).

@learn-more
Copy link
Member

@learn-more learn-more commented Oct 6, 2017

If you do a clean checkout, are the files correct then?

@ColinFinck
Copy link
Member Author

@ColinFinck ColinFinck commented Oct 6, 2017

@ColinFinck ColinFinck merged commit 950c86f into reactos:master Oct 6, 2017
@ColinFinck ColinFinck deleted the ColinFinck:fix-crlf-completely branch Oct 6, 2017
HBelusca added a commit to HBelusca/reactos that referenced this pull request Oct 7, 2017
Based on https://stackoverflow.com/a/1511273

Also enforce CRLF for all *.xml files in our tree, because they are distributed with ReactOS.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants
X Tutup