[PATCH] D124563: Renormalize line endings after ac5f7be6a8688955a282becf00eebc542238a86b

Di Mo via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Wed Apr 27 16:59:33 PDT 2022

modimo added a comment.

In D124563#3478627 <https://reviews.llvm.org/D124563#3478627>, @smeenai wrote:

> If I check out this commit and then check out the previous commit, `clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp` and `clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected` become modified in my working directory; their line endings are changed from CRLF to LF. That seems undesirable.

Good catch, I see it as well. The `.gitattributes` change needs to be atomic with the renormalization change. If I checkout from main after the `.gitattributes` change (`git checkout ac5f7be6a868`) I'll see the files as dirty. However, if I checkout the revision before (`git checkout ac5f7be6a868~1`) this goes away. I think the way to go is to revert ac5f7be6a868 <https://reviews.llvm.org/rGac5f7be6a8688955a282becf00eebc542238a86b> then land everything as a single stack to prevent this issue.

  rG LLVM Github Monorepo



More information about the cfe-commits mailing list