git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: git@vger.kernel.org
Subject: Re: send-email adds redundant From: lines to message body
Date: Tue, 18 Jun 2013 15:36:53 +0300	[thread overview]
Message-ID: <20130618123653.GE26857@redhat.com> (raw)
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?= <szeder@ira.uka.de>
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 <mst@redhat.com>

---

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é <odd_?=mail@example.com>" 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é <odd_?=mail@example.com>" &&
+	git format-patch --stdout -1 >funny_name.patch &&
+	git send-email --from="Füñný Nâmé <odd_?=mail@example.com>" \
+	  --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 &&

  reply	other threads:[~2013-06-18 12:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 11:09 send-email adds redundant From: lines to message body SZEDER Gábor
2013-06-18 11:42 ` Michael S. Tsirkin
2013-06-18 11:48   ` SZEDER Gábor
2013-06-18 12:36     ` Michael S. Tsirkin [this message]
2013-06-18 12:50     ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130618123653.GE26857@redhat.com \
    --to=mst@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=szeder@ira.uka.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).