Author: Aaron Puchert Date: 2022-04-28T03:05:10+02:00 New Revision: c9a16e8c3d99173c7525e576d78eed57110d2b08
URL: https://github.com/llvm/llvm-project/commit/c9a16e8c3d99173c7525e576d78eed57110d2b08 DIFF: https://github.com/llvm/llvm-project/commit/c9a16e8c3d99173c7525e576d78eed57110d2b08.diff LOG: Drop '* text=auto' from .gitattributes and normalize Git wants to check in 'text' files with LF endings, so this changes them in the repository but not in the checkout, where they keep CRLF endings. Differential Revision: https://reviews.llvm.org/D124563 Added: Modified: clang-tools-extra/test/.gitattributes clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected Removed: ################################################################################ diff --git a/clang-tools-extra/test/.gitattributes b/clang-tools-extra/test/.gitattributes index 9d17a32c7b261..42567e3196d61 100644 --- a/clang-tools-extra/test/.gitattributes +++ b/clang-tools-extra/test/.gitattributes @@ -2,10 +2,6 @@ # rely on or check fixed character -offset, Offset: or FileOffset: locations # will fail when run on input files checked out with diff erent line endings. -# Most test input files should use native line endings, to ensure that we run -# tests against both line ending types. -* text=auto - # These test input files rely on one-byte Unix (LF) line-endings, as they use # fixed -offset, FileOffset:, or Offset: numbers in their tests. clang-apply-replacements/ClangRenameClassReplacements.cpp text eol=lf diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp index 26f79968f556d..09e50c292cc91 100644 --- a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp +++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp @@ -1,6 +1,6 @@ - -// This file intentionally uses a CRLF newlines! - -void foo() { - int *x = 0; -} + +// This file intentionally uses a CRLF newlines! + +void foo() { + int *x = 0; +} diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected index ad8e907856283..7a5e11354748d 100644 --- a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected +++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected @@ -1,6 +1,6 @@ - -// This file intentionally uses a CRLF newlines! - -void foo() { - int *x = nullptr; -} + +// This file intentionally uses a CRLF newlines! + +void foo() { + int *x = nullptr; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
