On 07/09/15 08:45, Paolo Bonzini wrote: > > > On 08/07/2015 23:03, Laszlo Ersek wrote: >> On 07/08/15 22:36, Ryan Harkin wrote: >> >>> I have an alias in my ~/.gitconfig file: >>> >>> [alias] >>> amm=am --ignore-whitespace --ignore-space-change >>> >>> >>> Then I use "git amm" to apply patches and that seems to work most of the >>> time. >>> >>> But I suspect your method is doing something smarter and more complex >>> whereas mine is more brute force. >> >> Right. Your command is perfect for ad-hoc testing, but it ignores more >> whitespace than what would be acceptable for actually committing a patch >> to SVN. For example, it would enable source files to become mixed LF and >> CRLF, I think. (Because: >> - git-am would strip all \r characters from the patch email, >> - ignore the resultant LF <-> CRLF mismatch in the hunks' contexts, >> - and add the new lines with LF only.) >> >> BTW, Paolo had written code for git at some point that fixed this issue >> within git: >> >> http://thread.gmane.org/gmane.comp.version-control.git/260215 > > This was included in git 2.3.0. :)
Yay! \o/ Thank you! :) Laszlo > > Paolo > >> His idea was to armor patch emails against line terminator changes >> incurred by MTAs. (Which is what makes the "sed" command necessary in my >> method, for the /dev/null hunk headers.) >> >> Although the quoted-printable and base64 transfer encodings, used for >> such protection, would have resulted in human-*un*readable raw email >> files, Paolo suggested a one liner back-converter for those who like to >> save patch emails to regular files, for comparing them between each >> other. The results would have been very useful: "git-am" would just >> work, and people comparing raw patches could rely on a one-liner in >> their workflow. >> >> Alas, I'm unsure about the fate of Paolo's work. I think he didn't have >> time to work on further versions of the patch set, and I had neither the >> time nor the expertise. >> >> Thanks! >> Laszlo >> ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
