about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2021-02-16 21:59:28 -0500
committerCaleb Cartwright <calebcartwright@users.noreply.github.com>2021-04-21 21:17:36 -0500
commit6767c1d0517fb6ad634df0e726f1da66d0df6be8 (patch)
treeb1b49b9127783d8e12b20597012aadcddc5224ff
parent0bd2b1927c2b02a6fe7447d58e897cf1f1a1d41f (diff)
downloadrust-6767c1d0517fb6ad634df0e726f1da66d0df6be8.tar.gz
rust-6767c1d0517fb6ad634df0e726f1da66d0df6be8.zip
Don't show CRLF tests as modified in the working directory
This was being overriden by `lf=eof` in `.gitattributes` in the root
directory. Override it again to avoid warnings like this:

```
$ git diff src/tools/rustfmt/tests/target/issue-3494/crlf.rs
warning: CRLF will be replaced by LF in src/tools/rustfmt/tests/target/issue-3494/crlf.rs.
The file will have its original line endings in your working directory
```
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..bce42ce79cc
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Stop git from showing CRLF tests as modified
+* eol=Unset