Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4

diff --git a/git-send-email.perl b/git-send-email.perl
index 87f59fa313f4483dc15846979e80e8a8aec3d1f5..7552caca4bbbb38b161cfb47f94d4577627ccbb3 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -254,6 +254,8 @@ sub format_2822_time {
        }
 }
 
+($from) = expand_aliases($from) if defined $from;
+
 my $prompting = 0;
 if (!defined $from) {
        $from = $author || $committer;
@@ -408,6 +410,7 @@ sub extract_valid_address {
        return $address if ($address =~ /^($local_part_regexp)$/);
 
        if ($have_email_valid) {
+               $address =~ s/^\s*<(.*)>\s*$/$1/;
                return scalar Email::Valid->address($address);
        } else {
                # less robust/correct than the monster regexp in Email::Valid,