* send-email adds redundant From: lines to message body
@ 2013-06-18 11:09 SZEDER Gábor
2013-06-18 11:42 ` Michael S. Tsirkin
0 siblings, 1 reply; 5+ messages in thread
From: SZEDER Gábor @ 2013-06-18 11:09 UTC (permalink / raw)
To: Michael S. Tsirkin, git
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
Bisect points to:
commit da18759e86bb1a7ee718c79a0c6cb15fbcbdf3c2
Author: Michael S. Tsirkin <mst@redhat.com>
Date: 2013-06-05 21:11:00 +0300
send-email: make --suppress-cc=self sanitize input
--suppress-cc=self fails to filter sender address in many cases where it
needs to be sanitized in some way, for example quoted:
"A U. Thor" <author@example.com>
To fix, make send-email sanitize both sender and the address it is
compared against.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The exact commands I run were:
git format-patch --cover-letter --subject-prefix='PATCH v2' 2847cae835fa70f00e6e2286fbfa5595cb2247d0..bash-prompt-speedup
vim 0000-cover-letter.patch
git send-email --to=git@vger.kernel.org 00*
i.e. no '--suppress-cc=self' option at all. Values of related config
variables are:
git config --get-regexp '(sendemail|user)\..*'
sendemail.smtpserver /usr/local/bin/putmail
sendemail.confirm auto
user.name SZEDER Gábor
user.email szeder@ira.uka.de
The 'á' in my first name is apparently significant: creating a commit
and sending it as a patch with that accent removed doesn't trigger a
redundant From: line.
Thanks,
Gábor
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: send-email adds redundant From: lines to message body
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
0 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2013-06-18 11:42 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git
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?
> Bisect points to:
>
> commit da18759e86bb1a7ee718c79a0c6cb15fbcbdf3c2
> Author: Michael S. Tsirkin <mst@redhat.com>
> Date: 2013-06-05 21:11:00 +0300
>
> send-email: make --suppress-cc=self sanitize input
>
> --suppress-cc=self fails to filter sender address in many cases where it
> needs to be sanitized in some way, for example quoted:
> "A U. Thor" <author@example.com>
> To fix, make send-email sanitize both sender and the address it is
> compared against.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>
> The exact commands I run were:
>
> git format-patch --cover-letter --subject-prefix='PATCH v2' 2847cae835fa70f00e6e2286fbfa5595cb2247d0..bash-prompt-speedup
> vim 0000-cover-letter.patch
> git send-email --to=git@vger.kernel.org 00*
>
> i.e. no '--suppress-cc=self' option at all. Values of related config
> variables are:
>
> git config --get-regexp '(sendemail|user)\..*'
> sendemail.smtpserver /usr/local/bin/putmail
> sendemail.confirm auto
> user.name SZEDER Gábor
> user.email szeder@ira.uka.de
>
> The 'á' in my first name is apparently significant: creating a commit
> and sending it as a patch with that accent removed doesn't trigger a
> redundant From: line.
>
>
> Thanks,
> Gábor
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: send-email adds redundant From: lines to message body
2013-06-18 11:42 ` Michael S. Tsirkin
@ 2013-06-18 11:48 ` SZEDER Gábor
2013-06-18 12:36 ` Michael S. Tsirkin
2013-06-18 12:50 ` Michael S. Tsirkin
0 siblings, 2 replies; 5+ messages in thread
From: SZEDER Gábor @ 2013-06-18 11:48 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: git
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: send-email adds redundant From: lines to message body
2013-06-18 11:48 ` SZEDER Gábor
@ 2013-06-18 12:36 ` Michael S. Tsirkin
2013-06-18 12:50 ` Michael S. Tsirkin
1 sibling, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2013-06-18 12:36 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git
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 &&
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: send-email adds redundant From: lines to message body
2013-06-18 11:48 ` SZEDER Gábor
2013-06-18 12:36 ` Michael S. Tsirkin
@ 2013-06-18 12:50 ` Michael S. Tsirkin
1 sibling, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2013-06-18 12:50 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git
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
Okay, missed sanitizing author in one more place.
I sent a patch that should fix it for you,
tested-by reports appreciated.
--
MST
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-18 12:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2013-06-18 12:50 ` Michael S. Tsirkin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).