[PATCH] D124563: Renormalize line endings after ac5f7be6a8688955a282becf00eebc542238a86b

Wed Apr 27 16:38:13 PDT 2022

aaronpuchert added a comment.

Most of the files changed here are not affected by the `.gitattributes` file, such as

  clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include.h
  clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include2.h
  clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/sys/types.h
  clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
  clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap
  clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap
  clang-tools-extra/test/pp-trace/Inputs/module.map

The only affected files seem to be

  clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp
  clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected

Looking back at D97625 <https://reviews.llvm.org/D97625>, the main goal of that change was to ensure that tests relying on LF endings also work on Windows, and the two files that want CRLF did not in fact cause test failures.

So maybe we should simply remove

  # These test input files rely on two-byte Windows (CRLF) line endings.
  clang-apply-replacements/Inputs/crlf/crlf.cpp text eol=crlf
  clang-apply-replacements/Inputs/crlf/crlf.cpp.expected text eol=crlf

from the `.gitattributes` file again. Then we can keep them stored with CRLF endings, and each file has a comment anyway that they rely on them. The files have been there for many years and never been a problem.

Could you test if this works for you?

We can still discuss normalizing the other files, but maybe we can get some reviewers involved in `clang-tools-extra` for that.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D124563/new/

https://reviews.llvm.org/D124563