diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:51:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:51:47 -0700 |
| commit | 4692f32ddfb6a633c83d6a731f5a8cfbea218e7c (patch) | |
| tree | 39805bfe1583b46f3d870867617a846b3db1a902 /git-send-email.perl | |
| parent | d0ae7e2e71a6d8b9eb198ed0a5e1462013f7c65d (diff) | |
| parent | b622d4d11d27fd290f7732c6a65f40c054796c1f (diff) | |
| download | git-4692f32ddfb6a633c83d6a731f5a8cfbea218e7c.tar.gz | |
Merge branch 'tr/maint-send-email-2047'
"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
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index ef30c557c7..664713709c 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) : $_; } |