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

Fixes the files that aren't text from being corrupted by git #1126

Conversation

StephenBrown2
Copy link
Contributor

due to the change in #1124

Github Issue (if applicable): #1124

Trello Link (if applicable):

Forum Link (if applicable):

Explanation of Bugfix/Feature/Enhancement:

Changing the .gitattributes for EVERY file did just that, and replaced CRLF with LF, even if it wasn't actually text.

Recommended Release Notes:

Copy link
Member

@thekevinbrown thekevinbrown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@thekevinbrown thekevinbrown merged commit 77ef97e into toolkit-for-ynab:master Jan 11, 2018
@joshmadewell
Copy link
Member

:woops: thanks @StephenBrown2!

@dbaldon
Copy link
Contributor

dbaldon commented Jan 11, 2018

And this broke me again. I suspect it's because of a missing comma between *.yaml and text eol=lf. I updated the .gitattributes file but it's too late. @blargity can you make the change on master and I'll re-clone the repo?

@StephenBrown2
Copy link
Contributor Author

Hmm, the syntax doesn't say there should be a comma between the file pattern and the text string: https://git-scm.com/docs/gitattributes#_effects
Perhaps using this sample file? https://github.com/alexkaratarakis/gitattributes/blob/master/Web.gitattributes

Github does have some documentation on the matter too: https://help.github.com/articles/dealing-with-line-endings/#refreshing-a-repository-after-changing-line-endings

@dbaldon
Copy link
Contributor

dbaldon commented Jan 11, 2018

I think the problem was that the text eol=lf was only applicable to the last specification in the list. IOW, only the *.yaml specification. If it would have been *.js text eol=lf, *.yaml text eol=lf I think that would have worked.

@StephenBrown2
Copy link
Contributor Author

Good point. In that case, I recommend we go with the sample gitattributes file I linked from alexkaratarakis's repo.

@dbaldon
Copy link
Contributor

dbaldon commented Jan 12, 2018

Yeah. Kevin already did that and it fixed things. Ate you on the slack channel? If not, you should send your email to Kevin so he can add you.

@StephenBrown2
Copy link
Contributor Author

StephenBrown2 commented Jan 12, 2018 via email

@StephenBrown2 StephenBrown2 deleted the fix_nontext_line_endings_from_1124 branch January 15, 2018 14:57
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 this pull request may close these issues.

None yet

4 participants