diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:24:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:24:41 -0700 |
| commit | 423a9e28fc144624437cb00ce853b741891ae623 (patch) | |
| tree | 122813b166013c768daa1a0c011300cd84f74133 | |
| parent | 5f9d8e3572e507fec9047fbfc216821d23b42881 (diff) | |
| parent | b622d4d11d27fd290f7732c6a65f40c054796c1f (diff) | |
| download | git-423a9e28fc144624437cb00ce853b741891ae623.tar.gz git-423a9e28fc144624437cb00ce853b741891ae623.tar.xz | |
Merge branch 'tr/maint-send-email-2047' into maint-1.7.11
"git send-email" did not unquote encoded words that appear on the
header correctly, and lost "_" from strings.
* tr/maint-send-email-2047:
send-email: improve RFC2047 quote parsing
| -rwxr-xr-x | git-send-email.perl | 10 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index ef30c557c..664713709 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -862,11 +862,13 @@ $time = time - scalar $#files; sub unquote_rfc2047 { local ($_) = @_; my $encoding; - if (s/=\?([^?]+)\?q\?(.*)\?=/$2/g) { + s{=\?([^?]+)\?q\?(.*?)\?=}{ $encoding = $1; - s/_/ /g; - s/=([0-9A-F]{2})/chr(hex($1))/eg; - } + my $e = $2; + $e =~ s/_/ /g; + $e =~ s/=([0-9A-F]{2})/chr(hex($1))/eg; + $e; + }eg; return wantarray ? ($_, $encoding) : $_; } diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 8c12c65c7..035122808 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -841,6 +841,19 @@ test_expect_success $PREREQ '--compose adds MIME for utf8 subject' ' grep "^Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1 ' +test_expect_success $PREREQ 'utf8 author is correctly passed on' ' + clean_fake_sendmail && + test_commit weird_author && + 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="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + funny_name.patch && + grep "^From: Füñný Nâmé <odd_?=mail@example.com>" msgtxt1 +' + test_expect_success $PREREQ 'detects ambiguous reference/file conflict' ' echo master > master && git add master && |