On Thu, 2016-02-18 at 13:40 +0100, Laszlo Ersek wrote: > > We should not be carrying patches which *differ* from the fixes that > > went into OpenSSL upstream. > > So yeah, I guess the recent irrelevance of this edk2-only hunk should > have been "obvious" from the 3000-line diff between OpenSSL 1.0.2e and > 1.0.2f -- a diff that no person not involved in day-to-day OpenSSL > development can review.
Actually, that isn't fixed in OpenSSL 1.0.2f; it's fixed only in 1.1 and I've backported the fix. > > Can we *please* keep native line endings in the git tree > > No, we can't. This issue has been discussed with Junio C Hamano, the git > maintainer. Git can convert text files to platform-native line endings > on checkout, but only if the internal (object) representation of the > text files is LF only. > > And, because edk2 started out with SVN, and the (now primary) git repo > started out as a mirror of the SVN repo, the internal representation is > CRLF, not LF. So git's auto-conversion doesn't apply. Apologies, I misspoke. I didn't mean "native line endings in the git tree", which is obviously impossible — I meant "sane line endings in the git tree", which means LF — so git's auto-conversion *would* apply. > Everyone else did not start with a git mirror of an SVN repo of text > files that were created and edited exclusively on Windows. :( A poor excuse. It wasn't hard to fix up the SVN->git mirror, and we knew we needed to do this *long* before git actually became the "primary" system. And even if we've missed the chance to do it "in retrospect" for historical commits in our canonical git repository, we could still make a commit now which *changes* the line endings to what git expects, and quite soon this whole nonsense would be a thing of the past. -- David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
