projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
[git.git]
/
git-send-email.perl
diff --git
a/git-send-email.perl
b/git-send-email.perl
index ef30c557c7dee549e891fe7605902ba58d0566a3..664713709c0b6e6e4974faa8f0800df2f0beb8e5 100755
(executable)
--- a/
git-send-email.perl
+++ b/
git-send-email.perl
@@
-862,11
+862,13
@@
$time = time - scalar $#files;
sub unquote_rfc2047 {
local ($_) = @_;
my $encoding;
sub unquote_rfc2047 {
local ($_) = @_;
my $encoding;
-
if (s/=\?([^?]+)\?q\?(.*)\?=/$2/g)
{
+
s{=\?([^?]+)\?q\?(.*?)\?=}
{
$encoding = $1;
$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) : $_;
}
return wantarray ? ($_, $encoding) : $_;
}