send-email adds redundant From: lines to message body
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 m...@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 aut...@example.com To fix, make send-email sanitize both sender and the address it is compared against. Signed-off-by: Michael S. Tsirkin m...@redhat.com Signed-off-by: Junio C Hamano gits...@pobox.com The exact commands I run were: git format-patch --cover-letter --subject-prefix='PATCH v2' 2847cae835fa70f00e6e2286fbfa5595cb2247d0..bash-prompt-speedup vim -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 sze...@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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: send-email adds redundant From: lines to message body
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 m...@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 aut...@example.com To fix, make send-email sanitize both sender and the address it is compared against. Signed-off-by: Michael S. Tsirkin m...@redhat.com Signed-off-by: Junio C Hamano gits...@pobox.com The exact commands I run were: git format-patch --cover-letter --subject-prefix='PATCH v2' 2847cae835fa70f00e6e2286fbfa5595cb2247d0..bash-prompt-speedup vim -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 sze...@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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: send-email adds redundant From: lines to message body
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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: send-email adds redundant From: lines to message body
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?= sze...@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 m...@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_?=m...@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_?=m...@example.com + git format-patch --stdout -1 funny_name.patch + git send-email --from=Füñný Nâmé odd_?=m...@example.com \ + --to=nob...@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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: send-email adds redundant From: lines to message body
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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
