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

Enforce LF #12931

Merged
merged 2 commits into from
Mar 7, 2014
Merged

Enforce LF #12931

merged 2 commits into from
Mar 7, 2014

Conversation

XhmikosR
Copy link
Member

@XhmikosR XhmikosR commented Mar 5, 2014

Refs #12927

Another way would be to keep doing what we did and specify the filetypes ourselves, but this seems cleaner maybe :/

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

/CC @cvrebert @juthilo

@juthilo
Copy link
Collaborator

juthilo commented Mar 5, 2014

Technically, text belongs in the same column as binary, but otherwise, this looks great. You be the judge on whether it reliably works though. :)

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

I tested it and works as expected with autocrlf on Windows. :)

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

This looks weird if I indent it like you suggest @juthilo :P

# Enforce Unix newlines for all the files in the repository
*       text    eol=lf
*.png   binary
*.jpg   binary

But I don't mind, whatever most people like...

@juthilo
Copy link
Collaborator

juthilo commented Mar 5, 2014

👍

@juthilo
Copy link
Collaborator

juthilo commented Mar 5, 2014

No no, leave it as is, it's fine. :)

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

OK, I'll wait for @cvrebert's feedback too and then merge it.

@XhmikosR XhmikosR mentioned this pull request Mar 5, 2014
@zlatanvasovic
Copy link
Contributor

What about my credits for "Normalize line engings" commit?

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

There's no credit to give to; I did it myself.

For reference https://help.github.com/articles/dealing-with-line-endings#re-normalizing-a-repository

@zlatanvasovic
Copy link
Contributor

It doesn't differ from https://github.com/ZDroid/bootstrap/commit/0b7bbba2c9d442a8eaad60db27ab8b1cf7992b2e (except for the .gitattributes change). Whatever.

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

Obviously it can't differ; it's the same thing. You didn't invent something new.

@juthilo juthilo added this to the v3.2.0 milestone Mar 5, 2014
@juthilo juthilo added the meta label Mar 5, 2014
@cvrebert
Copy link
Collaborator

cvrebert commented Mar 5, 2014

We should also set the applicable font file types as binary.

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

Well, true, but they aren't touched by git so it seems pointless at this point. The types I added are modified by git if we don't specify them explicitly.

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 5, 2014

@cvrebert: what do you think of this way? Should I just add svg instead of this?

@mdo
Copy link
Member

mdo commented Mar 7, 2014

Seems fine—tests are failing though.

@cvrebert
Copy link
Collaborator

cvrebert commented Mar 7, 2014

That's just iOS 7 Safari being flaky.

@cvrebert
Copy link
Collaborator

cvrebert commented Mar 7, 2014

@XhmikosR Either way seems fine.

@XhmikosR
Copy link
Member Author

XhmikosR commented Mar 7, 2014

So which of the two ways do you prefer? I think I like more the other way, by adding svg only...

@cvrebert
Copy link
Collaborator

cvrebert commented Mar 7, 2014

@XhmikosR Let's do the svg way then. I was slightly irrationally fearful about relying on autodetection anyway.

XhmikosR added a commit that referenced this pull request Mar 7, 2014
@XhmikosR XhmikosR merged commit 24ec60e into master Mar 7, 2014
@XhmikosR XhmikosR deleted the line-endings branch March 7, 2014 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants