diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:47 -0700 |
| commit | 8cad7fcfbcba99fa1541bf6ca1f2ad83767fc348 (patch) | |
| tree | 517fb1f20e9540a818f6d5b569f43917dbdeec22 | |
| parent | 517736ffcf7e0a81cef938987b4cc4ed82b3408f (diff) | |
| parent | a277d1efa35ea47ac473ed7e3d92fc6f1c04da7d (diff) | |
| download | git-8cad7fcfbcba99fa1541bf6ca1f2ad83767fc348.tar.gz | |
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
| -rwxr-xr-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index d356901348..c45b22a19a 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -533,7 +533,7 @@ my %parse_alias = ( $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) ]; }}}, |