Skip to content

Commit 8cad7fc

Browse files
committed
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
2 parents 517736f + a277d1e commit 8cad7fc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-send-email.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ sub parse_sendmail_aliases {
533533
$aliases{$alias} = \@addr
534534
}}},
535535
mailrc => sub { my $fh = shift; while (<$fh>) {
536-
if (/^alias\s+(\S+)\s+(.*)$/) {
536+
if (/^alias\s+(\S+)\s+(.*?)\s*$/) {
537537
# spaces delimit multiple addresses
538538
$aliases{$1} = [ quotewords('\s+', 0, $2) ];
539539
}}},

0 commit comments

Comments
 (0)