Merge branch 'rz/worktree-no-checkout'

diff --git a/git-send-email.perl b/git-send-email.perl
index d356901348042a7f2ec67211857e4d551d169d52..c45b22a19a06234d1106eedfeb8f80d29c37370e 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -533,7 +533,7 @@ sub parse_sendmail_aliases {
                        $aliases{$alias} = \@addr
                }}},
        mailrc => sub { my $fh = shift; while (<$fh>) {
-               if (/^alias\s+(\S+)\s+(.*)$/) {
+               if (/^alias\s+(\S+)\s+(.*?)\s*$/) {
                        # spaces delimit multiple addresses
                        $aliases{$1} = [ quotewords('\s+', 0, $2) ];
                }}},