]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mm/send-email-cc-cruft-after-address' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:54 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:55 +0000 (13:27 -0800)
"git send-email" attempts to pick up valid e-mails from the
trailers, but people in real world write non-addresses there, like
"Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
on the availability and vintage of Mail::Address perl module.

* mm/send-email-cc-cruft-after-address:
  Git.pm: add comment pointing to t9000
  t9000-addresses: update expected results after fix
  parse_mailboxes: accept extra text after <...> address

1  2 
perl/Git.pm
t/t9001-send-email.sh

diff --cc perl/Git.pm
Simple merge
Simple merge