diff options
| author | Haojian Wu <hokein@google.com> | 2019-09-10 12:17:49 +0000 |
|---|---|---|
| committer | Haojian Wu <hokein@google.com> | 2019-09-10 12:17:49 +0000 |
| commit | 973bd3e974bcad9040a072995e20044820aae0fe (patch) | |
| tree | af06ca4382323568f192510cc50ee81322c13865 /llvm/.gitattributes | |
| parent | d9442afba1bd65fd0b5c93b67922eaed923445e2 (diff) | |
| download | llvm-973bd3e974bcad9040a072995e20044820aae0fe.tar.gz | |
Fix the "git modified" issue on the preserve-comments-crlf.s.
Summary:
rL371473 corrected the line ending (to crlf) in preserve-comments-crlf.s, but it causes a wired issue on git
repository (I ran git pull today, it showed a local change of that file even I did not change anything).
Reviewers: gribozavr
Reviewed By: gribozavr
Subscribers: llvm-commits, cfe-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D67391
llvm-svn: 371513
Diffstat (limited to 'llvm/.gitattributes')
| -rw-r--r-- | llvm/.gitattributes | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/.gitattributes b/llvm/.gitattributes index a16d741a7e74..48ddf2f02d15 100644 --- a/llvm/.gitattributes +++ b/llvm/.gitattributes @@ -13,5 +13,7 @@ test/tools/llvm-strings/Inputs/numbers binary test/MC/AsmParser/incbin_abcd binary test/YAMLParser/spec-09-02.test binary -# Windows line ending test -test/MC/AsmParser/preserve-comments-crlf.s text eol=crlf +# This file must have CRLF line endings, therefore git should treat it as +# binary and not autoconvert line endings (for example, when core.autocrlf is +# on). +test/MC/AsmParser/preserve-comments-crlf.s binary |