From 973bd3e974bcad9040a072995e20044820aae0fe Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Tue, 10 Sep 2019 12:17:49 +0000 Subject: [PATCH] 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 --- llvm/.gitattributes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/llvm/.gitattributes b/llvm/.gitattributes index a16d741..48ddf2f 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 -- 2.7.4