[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Michael Forster via Phabricator via cfe-commits
MForster added a comment. In D124563#3479990 , @aaronpuchert wrote: > In D124563#3478625 , @smeenai wrote: > >> I *think* this would mean that if you're on Windows and have `core.autocrlf` >> set to `input`, whe

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. In D124563#3479819 , @MForster wrote: > See D124606 . `-text` seems to be the right > compromise. To quote an earlier comment from this thread: In D124563#3478625

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Michael Forster via Phabricator via cfe-commits
MForster added a comment. > In D124563#3479405 , @MForster > wrote: > >> It also seems weird to me that a file that relies on CRLF line endings is >> checked in explicitly with LF line endings. A better approach IMHO would be >> to check it in as binary

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. As a temporary workaround for switching between branches, just add a local file `clang-tools-extra/test/clang-apply-replacements/.gitattributes` with contents: Inputs/crlf/crlf.cpp binary Inputs/crlf/crlf.cpp.expected binary This will remove all kinds of filter

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. In D124563#3479373 , @nikic wrote: > This change seems to have broken switching to a branch before the commit > completely. The only way I was able to recover my git checkout is to comment > out the `* text=auto` line and t

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Michael Forster via Phabricator via cfe-commits
MForster added a comment. I'm proposing this: D124606 . Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D124563/new/ https://reviews.llvm.org/D124563 ___ cfe-commits mailin

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Michael Forster via Phabricator via cfe-commits
MForster added a comment. It also seems weird to me that a file that relies on CRLF line endings is checked in explicitly with LF line endings. A better approach IMHO would be to check it in as binary. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-28 Thread Nikita Popov via Phabricator via cfe-commits
nikic added a comment. This change seems to have broken switching to a branch before the commit completely. The only way I was able to recover my git checkout is to comment out the `* text=auto` line and then run `git reset --hard`, otherwise the crlf.cpp files always show up as changed. Repo

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. In D124563#3478978 , @aaronpuchert wrote: > Git will apply the LF -> CRLF transformation when it checks out itself. Git > doesn't show the file as modified because after cleaning the file (i.e. > applying CRLF -> LF) it's

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Di Mo via Phabricator via cfe-commits
modimo added a comment. In D124563#3478978 , @aaronpuchert wrote: > In D124563#3478968 , @modimo wrote: > >> I used `arc patch` and also saw the same thing. > > The patch does actually change the files to LF endi

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. In D124563#3478968 , @modimo wrote: > I used `arc patch` and also saw the same thing. The patch does actually change the files to LF endings. So just applying the patch with non-Git tools will make LF endings, but Git will

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Di Mo via Phabricator via cfe-commits
modimo added a comment. In D124563#3478951 , @aaronpuchert wrote: > In D124563#3478937 , @modimo wrote: > >> Checking locally I'm seeing LF as the line ending in crlf.cpp in the working >> directory. Can you dou

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Di Mo via Phabricator via cfe-commits
modimo added a comment. In D124563#3478937 , @modimo wrote: > Checking locally I'm seeing LF as the line ending in crlf.cpp in the working > directory. Can you double check that everything matches up? Ah it was some strange setup on my end. Confirmed pa

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. In D124563#3478937 , @modimo wrote: > Checking locally I'm seeing LF as the line ending in crlf.cpp in the working > directory. Can you double check that everything matches up? I had this too, but checking out again seems t

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Aaron Puchert via Phabricator via cfe-commits
This revision was not accepted when it landed; it landed in state "Needs Revision". This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rGc9a16e8c3d99: Drop '* text=auto' from .gitattributes and normali

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Di Mo via Phabricator via cfe-commits
modimo requested changes to this revision. modimo added a comment. This revision now requires changes to proceed. Checking locally I'm seeing LF as the line ending in crlf.cpp in the working directory. Can you double check that everything matches up? Repository: rG LLVM Github Monorepo CHANG

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert commandeered this revision. aaronpuchert edited reviewers, added: modimo; removed: aaronpuchert. aaronpuchert added a comment. Ok, let's do it this way. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D124563/new/ https://reviews.llvm.org

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Di Mo via Phabricator via cfe-commits
modimo added a comment. In D124563#3478915 , @aaronpuchert wrote: > Drop `* text=auto`, so that we renormalize only the files that need it. Makes sense to me, thanks for putting it up. If you want to commandeer I can accept the change or you can accept

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Aaron Puchert via Phabricator via cfe-commits
aaronpuchert added a comment. Would be nice if someone could accept this. I think this comes closest to the intention of D97625 . Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D124563/new/ https://reviews.llvm.org/D

[PATCH] D124563: Drop '* text=auto' from .gitattributes and normalize

2022-04-27 Thread Di Mo via Phabricator via cfe-commits
modimo added a comment. In D124563#3478781 , @aaronpuchert wrote: > In D124563#3478653 , @modimo wrote: > >> I think the way to go is to revert ac5f7be6a868 >>