diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:31:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:31:06 -0700 |
| commit | e3f26752b5e9d38e88a09671d124b61fb0cd5dbf (patch) | |
| tree | fb5b5d9bc1c17bb827d97e4896d66a40c42de1ff /git-send-email.perl | |
| parent | Merge branch 'maint-1.7.11' into maint (diff) | |
| parent | Almost 1.7.11.6 (diff) | |
| download | tgif-e3f26752b5e9d38e88a09671d124b61fb0cd5dbf.tar.xz | |
Merge branch 'maint-1.7.11' into maint
* maint-1.7.11:
Almost 1.7.11.6
gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
rebase -i: use full onto sha1 in reflog
sh-setup: protect from exported IFS
receive-pack: do not leak output from auto-gc to standard output
t/t5400: demonstrate breakage caused by informational message from prune
setup: clarify error messages for file/revisions ambiguity
send-email: improve RFC2047 quote parsing
fsck: detect null sha1 in tree entries
do not write null sha1s to on-disk index
diff: do not use null sha1 as a sentinel value
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) : $_; } |