[llvm] r371513 - Fix the "git modified" issue on the preserve-comments-crlf.s.

Haojian Wu via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 10 05:17:49 PDT 2019


Author: hokein
Date: Tue Sep 10 05:17:49 2019
New Revision: 371513

URL: http://llvm.org/viewvc/llvm-project?rev=371513&view=rev
Log:
 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

Modified:
    llvm/trunk/.gitattributes

Modified: llvm/trunk/.gitattributes
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/.gitattributes?rev=371513&r1=371512&r2=371513&view=diff
==============================================================================
--- llvm/trunk/.gitattributes (original)
+++ llvm/trunk/.gitattributes Tue Sep 10 05:17:49 2019
@@ -13,5 +13,7 @@ test/tools/llvm-strings/Inputs/numbers b
 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




More information about the llvm-commits mailing list