Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees

diff --git a/git-send-email.perl b/git-send-email.perl
index edcc6d34692b28575d9728c25a407782310a39fb..bbf4deaa0d42ef2a843c2240000d7e34dfff0b62 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -26,10 +26,11 @@
 use Term::ANSIColor;
 use File::Temp qw/ tempdir tempfile /;
 use File::Spec::Functions qw(catdir catfile);
-use Error qw(:try);
+use Git::Error qw(:try);
 use Cwd qw(abs_path cwd);
 use Git;
 use Git::I18N;
+use Git::Mail::Address;
 
 Getopt::Long::Configure qw/ pass_through /;
 
@@ -489,7 +490,7 @@ sub read_config {
 ($repocommitter) = Git::ident_person(@repo, 'committer');
 
 sub parse_address_line {
-       return Git::parse_mailboxes($_[0]);
+       return map { $_->format } Mail::Address->parse($_[0]);
 }
 
 sub split_addrs {