Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/send-email-rtrim-mailrc-alias'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 6 Apr 2016 18:39:07 +0000
(11:39 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 6 Apr 2016 18:39:07 +0000
(11:39 -0700)
"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
git-send-email.perl
patch
|
blob
|
history
raw
(from parent 1:
67827f5
)
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) ];
}}},