[PATCH] D66556: [clang-scan-deps] Minimizer: Correctly handle multi-line content with CR+LF line endings

[Martin Storsjö via Phabricator via cfe-commits]

mstorsjo added a comment.

In D66556#1648591 <https://reviews.llvm.org/D66556#1648591>, @hans wrote:

> In D66556#1648118 <https://reviews.llvm.org/D66556#1648118>, @dexonsmith wrote:
>
> > In D66556#1648109 <https://reviews.llvm.org/D66556#1648109>, @rnk wrote:
> >
> > > I'm not sure what happens, but I see you added .gitattributes. I'd commit it as is. Buildbots using svn will keep working. You can check that the monorepo has the right line endings afterwards, and try again if not.
> >
> >
> > SGTM.
>
>
> This broke users of the monorepo, where the file would show up as having changed locally, and with no way to reset it. I'm guessing that's because it was checked in with LF endings and then because of the .gitattributes file, it changes at checkout. I think the correct solution would be to check in the file with CRLF endings and not set any attributes or stuff. (Though this is all super confusing and I might have got it wrong.)
>
> I've deleted the test file in r370175 to unblock development in the meantime.


Fwiw, this seems to me somewhat like a git bug; if I edit the .gitattributes file and comment out the problematic line, do a git diff, then uncomment the line again, then git diff suddenly shows no changes.


Repository:
  rL LLVM

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

https://reviews.llvm.org/D66556