Ignore line ending on older git versions #57858
Merged
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
rust-highfive
added
the
S-waiting-on-review
tesuji
reviewed
Jan 23, 2019
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.
pietroalbini
force-pushed
the
ignore-eol-images
branch
from
429b13d to
645b7c2
Compare
|
Thanks! @bors: r+ rollup |
|
📌 Commit 645b7c2 has been approved by |
|
🌲 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
Merged
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) Failed merges: r? @ghost
jethrogb
added a commit
to jethrogb/rustc-guide
that referenced
this pull request
Jan 14, 2020
jethrogb
added a commit
to jethrogb/miri
that referenced
this pull request
Jan 14, 2020
jethrogb
added a commit
to jethrogb/book
that referenced
this pull request
Jan 14, 2020
This was referenced Jan 14, 2020
mark-i-m
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Jan 14, 2020
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Jan 14, 2020
Update .gitattributes See rust-lang/rust#57858
bors bot
added a commit
to rust-embedded/book
that referenced
this pull request
Jan 14, 2020
221: Update .gitattributes r=therealprof a=jethrogb See rust-lang/rust#57858 Co-authored-by: jethrogb <[email protected]>
jethrogb
pushed a commit
to jethrogb/rust-analyzer
that referenced
this pull request
Jul 20, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of
.pngand.icofiles, and obviously it ruins them. This PR adds an attribute to those files to ignore which line ending they use.r? @GuillaumeGomez