mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint
"git send-email" had trouble parsing alias file in mailrc format when lines in it had trailing whitespaces on them. * jk/send-email-rtrim-mailrc-alias: send-email: ignore trailing whitespace in mailrc alias file
This commit is contained in:
commit
8cad7fcfbc
|
@ -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) ];
|
||||
}}},
|
||||
|
|
Loading…
Reference in a new issue