From: Michael S. Tsirkin Date: Tue, 18 Jun 2013 12:36:53 GMT Subject: Re: send-email adds redundant From: lines to message body Message-ID: <20130618123653.GE26857@redhat.com> In-Reply-To: <20130618114800.GB20052@goldbirke> On Tue, Jun 18, 2013 at 01:48:00PM +0200, SZEDER Gábor wrote: > On Tue, Jun 18, 2013 at 02:42:07PM +0300, Michael S. Tsirkin wrote: > > On Tue, Jun 18, 2013 at 01:09:04PM +0200, SZEDER Gábor wrote: > > > Hi, > > > > > > 'git send-email' recently started to add redundant From: lines to my > > > messages, see e.g. > > > > > > http://article.gmane.org/gmane.comp.version-control.git/228132 > > > > Can you please show what do commits point to? > > E.g. push to some public tree? > > Sure. > > https://github.com/szeder/git.git bash-prompt-speedup I see. The From line looks like this: From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= which is why it didn't match. I added a test like this and sure enough, it fails. Will look into a fix now. ---> send-email: add test for duplicate utf8 name Verify that author name is not duplicated if it matches sender, even if it is in utf8. Signed-off-by: Michael S. Tsirkin --- diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 9f46f22..cef884f 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -956,6 +956,19 @@ test_expect_success $PREREQ 'utf8 author is correctly passed on' ' grep "^From: Füñný Nâmé " msgtxt1 ' +test_expect_success $PREREQ 'utf8 sender is not duplicated' ' + clean_fake_sendmail && + test_commit weird_sender && + test_when_finished "git reset --hard HEAD^" && + git commit --amend --author "Füñný Nâmé " && + git format-patch --stdout -1 >funny_name.patch && + git send-email --from="Füñný Nâmé " \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + funny_name.patch && + test `grep "^From:" msgtxt1|wc -l` -eq 1 +' + test_expect_success $PREREQ 'sendemail.composeencoding works' ' clean_fake_sendmail && git config sendemail.composeencoding iso-8859-1 &&