Ignore line ending on older git versions by pietroalbini · Pull Request #57858 · rust-lang/rust (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation6 Commits1 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of .png and .ico files, and obviously it ruins them. This PR adds an attribute to those files to ignore which line ending they use.

r? @GuillaumeGomez

On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of .png and .ico files, and obviously it ruins them. This commit adds an attribute to those files to properly mark them as binary.

📌 Commit 645b7c2 has been approved by GuillaumeGomez

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

bors added S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

and removed S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

labels

Jan 23, 2019

Centril added a commit to Centril/rust that referenced this pull request

Jan 23, 2019

…uillaumeGomez

Ignore line ending on older git versions

On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of .png and .ico files, and obviously it ruins them. This PR adds an attribute to those files to ignore which line ending they use.

r? @GuillaumeGomez

bors added a commit that referenced this pull request

Jan 24, 2019

Rollup of 11 pull requests

Successful merges:

#57179 (Update std/lib.rs docs to reflect Rust 2018 usage)
#57730 (Merge visitors in AST validation)
#57779 (Recover from parse errors in literal struct fields and incorrect float literals)
#57793 (Explain type mismatch cause pointing to return type when it is impl Trait)
#57795 (Use structured suggestion in stead of notes)
#57817 (Add error for trailing angle brackets.)
#57834 (Stabilize Any::get_type_id and rename to type_id)
#57836 (Fix some cross crate existential type ICEs)
#57840 (Fix issue 57762)
#57844 (use port 80 for retrieving GPG key)
#57858 (Ignore line ending on older git versions)