From f07075c297d8a9b58b693176b6ae73dbabcdb103 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Tue, 18 Jun 2013 15:49:29 +0300 Subject: 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 (the test expects a failure that will be fixed in the next patch). Signed-off-by: Michael S. Tsirkin Signed-off-by: Junio C Hamano --- t/t9001-send-email.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index ebcb60a050..2a6f444bf8 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -956,6 +956,20 @@ test_expect_success $PREREQ 'utf8 author is correctly passed on' ' grep "^From: Füñný Nâmé " msgtxt1 ' +test_expect_failure $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 && + grep "^From: " msgtxt1 >msgfrom && + test_line_count = 1 msgfrom +' + test_expect_success $PREREQ 'sendemail.composeencoding works' ' clean_fake_sendmail && git config sendemail.composeencoding iso-8859-1 && -- cgit v1.2.3 From 4cb46bddeb7d21241f8ac5e46eb3d1cee468ea14 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Tue, 18 Jun 2013 15:49:26 +0300 Subject: send-email: sanitize author when writing From line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sender is now sanitized, but we didn't sanitize author when checking whether From: line is needed in the message body. As a result git started writing duplicate From: lines when author matched sender and has utf8 characters. Reported-by: SZEDER Gábor Signed-off-by: Michael S. Tsirkin Tested-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- git-send-email.perl | 5 +++-- t/t9001-send-email.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 7d886958ae..548c75d69a 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1258,6 +1258,7 @@ foreach my $t (@files) { open my $fh, "<", $t or die "can't open file $t"; my $author = undef; + my $sauthor = undef; my $author_encoding; my $has_content_type; my $body_encoding; @@ -1296,7 +1297,7 @@ foreach my $t (@files) { } elsif (/^From:\s+(.*)$/i) { ($author, $author_encoding) = unquote_rfc2047($1); - my $sauthor = sanitize_address($author); + $sauthor = sanitize_address($author); next if $suppress_cc{'author'}; next if $suppress_cc{'self'} and $sauthor eq $sender; printf("(mbox) Adding cc: %s from line '%s'\n", @@ -1392,7 +1393,7 @@ foreach my $t (@files) { $subject = quote_subject($subject, $auto_8bit_encoding); } - if (defined $author and $author ne $sender) { + if (defined $sauthor and $sauthor ne $sender) { $message = "From: $author\n\n$message"; if (defined $author_encoding) { if ($has_content_type) { diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 2a6f444bf8..d6f0271866 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -956,7 +956,7 @@ test_expect_success $PREREQ 'utf8 author is correctly passed on' ' grep "^From: Füñný Nâmé " msgtxt1 ' -test_expect_failure $PREREQ 'utf8 sender is not duplicated' ' +test_expect_success $PREREQ 'utf8 sender is not duplicated' ' clean_fake_sendmail && test_commit weird_sender && test_when_finished "git reset --hard HEAD^" && -- cgit v1.2.3