From: bonneta Date: Fri, 04 Jun 2010 10:21:07 GMT Subject: Re: [RFC/PATCH 2/4] textconv: make diff_options accessible from blame Message-ID: <57f94007bc6d4f34d1929a005110073f@ensimag.fr> In-Reply-To: On Fri, 04 Jun 2010 09:59:47 +0200, Matthieu Moy wrote: > Junio C Hamano writes: > >> Axel Bonnet writes: >> >>> Diff_options specify whether conversion is activated or not. Blame needs >>> to access these options in order to concert files with external drivers >>> >>> Signed-off-by: Diane Gasselin >>> Signed-off-by: Clément Poulain >>> Signed-off-by: Axel Bonnet >> >> The name of Clément is spelled correctly on the mail header while S-o-b >> line is corrupt. > > Actually, it's valid UTF-8, but there's no header specifying the > encoding in the email, therefore, the reader's default applies. My > mailer displays it correctly, but yours doesn't. > >> Perhaps you have recorded your commits in UTF-8 but allowed your MUA >> to send in 8859-1? > > The MUA seems to be git-send-email. According to the source (I didn't > find it in the doc), git-send-email looks at the patch's headers to > specify the encoding. > > On my machine, the patch applies well, and if I re-export it using > format-patch, I do get the headers: > > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > If I send myself the patch with git-send-email, I also get the headers > in the email (I tried from ensibm, which is the machine which sent the > patch serie). So, it doesn't look like a bug in git, but rather a > miss-use. > > Axel, can you give us the exact command(s) you used to send the patch? I made the patch with "git send-email --cover --annotate", and then edited the messages with vim. I added the S-o-b lines by copy-pasting them from the test mail I had send to Matthieu (from thunderbird). I saw there was a problem of encoding with the "é" of Clément, so I modified it. I think I should have written the S-o-b lines directly in vim.