summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-17 17:36:57 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-17 17:36:57 -0700
commit8299886619b8dab99773b5810f50c63a50b2d611 (patch)
tree22d82b20368b9483535861610fb64b07d038a892 /git-send-email.perl
parent5f85505265601823cc228fdc94d67d3b0ba582e4 (diff)
parent164b19893ab5bc66b531a26480149a0dff082969 (diff)
downloadgit-8299886619b8dab99773b5810f50c63a50b2d611.tar.gz
Merge branch 'maint'
* maint: Document core.excludesfile for git-add git-send-email: allow leading white space on mutt aliases
Diffstat (limited to 'git-send-email.perl')
-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 404095f258..eb876f88dd 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