On Tuesday, January 22, 2013 9:27 AM, Ian Abbott wrote: > On 2013/01/22 03:00 PM, Greg Kroah-Hartman wrote: >> On Tue, Jan 22, 2013 at 10:50:40AM +0000, Ian Abbott wrote: >>> On 2013-01-22 00:04, Greg Kroah-Hartman wrote: >>>> On Mon, Jan 21, 2013 at 03:16:11PM -0700, H Hartley Sweeten wrote: >>>>> The original series to cleanup this driver had some merge difficulties. >>>>> This is just a rebase of the patches that had issues, based on >>>>> next-20130121. >>>> >>>> Turns out the issue was the word "Dieselstraße", the encoding didn't >>>> like the 'ß' character for some reason. I fixed it up by hand. >>> >>> Probably because the original file containing the 'ß' was UTF-8, but >>> the patch that removed it was ISO-8859-1. git am (or rather, git >>> mailinfo) will transliterate the commit log part of the email to >>> UTF-8 by default, but leaves the patch part of the email in its >>> original charset (after any MIME transfer decoding). So when git >>> tried to apply the patch there would be a mismatch between the >>> original two-byte UTF-8 sequence and the single-byte ISO-8859-1 >>> sequence in the patch. >> >> Ah, that makes sense, thanks for figuring it out. If it happens again, >> I'll bug the git developers to work on a resolution. > > I think it's working as designed. I'm not sure of Hartley's process for > sending patches, but he appears to send them with KMail rather than git > send-email. It would be interesting to know whether his editor saved > the files with ISO-8859-1 (latin1) charset before he committed them > locally (examining the files produced by git format-patch would give a > clue), or whether its something KMail is doing to the messages. Yeah, I still haven't figured out how to configure my system correctly so that git send-email works... My editor is setup to use Unicode (UTF-8) encoding when opening/closing files. It appears the KMail might be the cause of the problem. In the KMail Configuration the Composer is setup to use the following Charsets: us-ascii iso-8859-1 utf-8 (locale) utf-8 This must be the default configuration because I don't remember ever changing it. I think I just need to move the utf-8 charsets up in the list so that they take precedence. Or, should I just remove the other charsets? Regards, Hartley _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
