summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Hendricks <michael@ndrix.org>2007-05-16 23:15:16 -0600
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-16 22:33:04 -0700
commit504ceab6d24bc19ed5a04b5978c8899fa58dffe1 (patch)
treed045bade29d0d6a37ce40a9901c6616cc7ac0db3
parentformat-patch: add MIME-Version header when we add content-type. (diff)
downloadtgif-504ceab6d24bc19ed5a04b5978c8899fa58dffe1.tar.xz
git-send-email: allow leading white space on mutt aliases
mutt version 1.5.14 (perhaps earlier versions too) permits alias files to have white space before the 'alias' keyword. Signed-off-by: Michael Hendricks <michael@ndrix.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-send-email.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 12ced28885..e60d8777f0 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -212,7 +212,7 @@ my $aliasfiletype = $repo->config('sendemail.aliasfiletype');
my %parse_alias = (
# multiline formats can be supported in the future
mutt => sub { my $fh = shift; while (<$fh>) {
- if (/^alias\s+(\S+)\s+(.*)$/) {
+ if (/^\s*alias\s+(\S+)\s+(.*)$/) {
my ($alias, $addr) = ($1, $2);
$addr =~ s/#.*$//; # mutt allows # comments
# commas delimit multiple addresses