Merge branch 'maint-1.6.2' into maint-1.6.3

diff --git a/git-send-email.perl b/git-send-email.perl
index 172b53c2d5b8ccad6a1bee592bccbe27d8f3127c..17f930f0f3c975725d83a5b0865b85a52c8741d0 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -418,6 +418,14 @@ sub split_addrs {
                        $x =~ /^(\S+)$f\t\(?([^\t]+?)\)?(:?$f){0,2}$/ or next;
                        $aliases{$1} = [ split_addrs($2) ];
                }},
+       elm => sub  { my $fh = shift;
+                     while (<$fh>) {
+                         if (/^(\S+)\s+=\s+[^=]+=\s(\S+)/) {
+                             my ($alias, $addr) = ($1, $2);
+                              $aliases{$alias} = [ split_addrs($addr) ];
+                         }
+                     } },
+
        gnus => sub { my $fh = shift; while (<$fh>) {
                if (/\(define-mail-alias\s+"(\S+?)"\s+"(\S+?)"\)/) {
                        $aliases{$1} = [ $2 ];
@@ -441,7 +449,6 @@ ($)
        try {
                $repo->command('rev-parse', '--verify', '--quiet', $f);
                if (defined($format_patch)) {
-                       print "foo\n";
                        return $format_patch;
                }
                die(<<EOF);