Fix gitattibutes for old git versions #83208
Merged
Conversation
This file contains 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 has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
Duplicate of #83162. |
|
Yes but this one has the changes that @joshtriplett requested |
Xanewok
reviewed
Mar 16, 2021
.gitattributes
Outdated
| @@ -7,10 +7,11 @@ | |||
| *.fixed linguist-language=Rust | |||
| *.mir linguist-language=Rust | |||
| src/etc/installer/gfx/* binary | |||
| *.woff binary | |||
| src/vendor/** -text | |||
| Cargo.lock linguist-generated=false | |||
|
|
|||
| # Older git versions try to fix line endings on images, this prevents it. | |||
There was a problem hiding this comment.
It'd be good to tweak the message to include both, as per #83162 (comment)
There was a problem hiding this comment.
You think “images” doesn't describe WOFF?
There was a problem hiding this comment.
Well, would you call a .woff file an "image" in a regular conversation? I think interpreting it an image is as technically correct and helpful as interpreting a text file as a "binary" file, which doesn't really help here. I'm just trying to avoid the shoehorning here.
|
☔ The latest upstream changes (presumably #83199) made this pull request unmergeable. Please resolve the merge conflicts. |
|
📌 Commit b1de9d4 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 18, 2021
Fix gitattibutes for old git versions
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 18, 2021
Fix gitattibutes for old git versions
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 19, 2021
Fix gitattibutes for old git versions
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 19, 2021
Fix gitattibutes for old git versions
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 19, 2021
Fix gitattibutes for old git versions
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 19, 2021
Fix gitattibutes for old git versions
This was referenced Mar 19, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 19, 2021
Rollup of 11 pull requests Successful merges: - rust-lang#82500 (Reuse `std::sys::unsupported::pipe` on `hermit`) - rust-lang#82759 (Remove unwrap_none/expect_none from compiler/.) - rust-lang#82846 (rustdoc: allow list syntax for #[doc(alias)] attributes) - rust-lang#82892 (Clarify docs for Read::read's return value) - rust-lang#83179 (Extend `proc_macro_back_compat` lint to `actix-web`) - rust-lang#83197 (Move some test-only code to test files) - rust-lang#83208 (Fix gitattibutes for old git versions) - rust-lang#83215 (Deprecate std::os::haiku::raw, which accidentally wasn't deprecated) - rust-lang#83230 (Remove unnecessary `forward_inner_docs` hack) - rust-lang#83236 (Upgrade memmap to memmap2) - rust-lang#83270 (Fix typo/inaccuracy in the documentation of Iterator::skip_while) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.