Skip to content

Commit

Permalink
Rollup merge of rust-lang#57858 - pietroalbini:ignore-eol-images, r=G…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Centril authored Jan 23, 2019
2 parents 8624485 + 645b7c2 commit e90cdfd
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ src/etc/installer/gfx/* binary
*.woff binary
src/vendor/** -text
Cargo.lock -merge linguist-generated=false

# Older git versions try to fix line endings on images, this prevents it.
*.png binary
*.ico binary

0 comments on commit e90cdfd

Please sign in to comment.