diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-09 16:26:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 16:26:49 -0700 |
| commit | e12bfd86c1939be056fcf65e13359bea2e820d01 (patch) | |
| tree | 40ed061bccf0ad9abd47df4fa5da1f20e5d3ed65 | |
| parent | c2c865684bf24ba422bb2624a5260df7302976fe (diff) | |
| parent | ffc01f9baddb09a90ad4c5f391344e6e907851c8 (diff) | |
| download | git-e12bfd86c1939be056fcf65e13359bea2e820d01.tar.gz git-e12bfd86c1939be056fcf65e13359bea2e820d01.tar.xz | |
Merge branch 'fc/mutt-alias'
* fc/mutt-alias:
send-email: fix mutt regex for grouped aliases
| -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 dd821f70c..f5ba4e769 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -401,7 +401,7 @@ my %aliases; my %parse_alias = ( # multiline formats can be supported in the future mutt => sub { my $fh = shift; while (<$fh>) { - if (/^\s*alias\s+(\S+)\s+(.*)$/) { + if (/^\s*alias\s+(?:-group\s+\S+\s+)*(\S+)\s+(.*)$/) { my ($alias, $addr) = ($1, $2); $addr =~ s/#.*$//; # mutt allows # comments # commas delimit multiple addresses |