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

(NFC) Convert files to use linux line endings not windows #12531

Merged
merged 1 commit into from
Jul 23, 2018

Conversation

seamuslee001
Copy link
Contributor

Overview

After noticing CRM/Contribute/Page/ContributionRecurPayments.php was a new file in dos line endings in 5.3 i went and found these other files that were also in dos line endings so fixing them. You should see that there is no function change by adding ?w=1 onto the end of the PR URL

Before

Dos line endings used

After

Linux line endings used

ping @eileenmcnaughton @colemanw @totten

@civibot
Copy link

civibot bot commented Jul 21, 2018

(Standard links)

@eileenmcnaughton
Copy link
Contributor

I would have put it against master rather than the rc but I agree it's whitespace only & ok to merge

@MiyaNoctem looks like you submitted the wrong endings? You might need to do some config?

@colemanw
Copy link
Member

Hmm, a few years ago I tried tackling this problem and came across IIF.tpl which says:

-***** IMPORTANT *************
Quickbooks allows almost NO variation in formatting. If editing this file pay
close attention to whitespace, empty lines, and invisible characters.

And that gave me pause...
I think the other files are safe to change though.

@seamuslee001
Copy link
Contributor Author

@colemanw i'll revert out the change with IIF.tpl for the moment in that case

@colemanw
Copy link
Member

It's too bad because otherwise there's a global variable we can set in git that will force all line endings to a standard. Just need to somehow verify that it's safe to do so on that IIF.tpl file. Perhaps @JoeMurray would know?

@seamuslee001
Copy link
Contributor Author

Jenkins re test this please

@seamuslee001
Copy link
Contributor Author

@civicrm-builder re test this please

2 similar comments
@seamuslee001
Copy link
Contributor Author

@civicrm-builder re test this please

@seamuslee001
Copy link
Contributor Author

@civicrm-builder re test this please

@eileenmcnaughton eileenmcnaughton merged commit 044c5c2 into civicrm:5.4 Jul 23, 2018
@eileenmcnaughton eileenmcnaughton deleted the fix_line_endings branch July 23, 2018 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants