diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-04-22 09:41:29 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-22 19:10:41 -0700 |
| commit | 7613ea3595f3a56f0f9d827944775940f1e72ef6 (patch) | |
| tree | 7dc2f2967eb657416e1ea3e7c698cc7989b0eebd | |
| parent | 7bd93c1c625ce5fa03f0d13d728f34f8ab868991 (diff) | |
| download | git-7613ea3595f3a56f0f9d827944775940f1e72ef6.tar.gz git-7613ea3595f3a56f0f9d827944775940f1e72ef6.tar.xz | |
Add parsing of elm aliases to git-send-email
elm stores a text file version of the aliases that is
<alias> = <comment> = <email address>
This adds the parsing of this file to git-send-email
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-send-email.txt | 2 | ||||
| -rwxr-xr-x | git-send-email.perl | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 0b1f183ce..794224b1b 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -262,7 +262,7 @@ sendemail.aliasesfile:: sendemail.aliasfiletype:: Format of the file(s) specified in sendemail.aliasesfile. Must be - one of 'mutt', 'mailrc', 'pine', or 'gnus'. + one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus'. sendemail.multiedit:: If true (default), a single editor instance will be spawned to edit diff --git a/git-send-email.perl b/git-send-email.perl index 172b53c2d..cccbf4517 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -418,6 +418,14 @@ my %parse_alias = ( $x =~ /^(\S+)$f\t\(?([^\t]+?)\)?(:?$f){0,2}$/ or next; $aliases{$1} = [ split_addrs($2) ]; }}, + elm => sub { my $fh = shift; + while (<$fh>) { + if (/^(\S+)\s+=\s+[^=]+=\s(\S+)/) { + my ($alias, $addr) = ($1, $2); + $aliases{$alias} = [ split_addrs($addr) ]; + } + } }, + gnus => sub { my $fh = shift; while (<$fh>) { if (/\(define-mail-alias\s+"(\S+?)"\s+"(\S+?)"\)/) { $aliases{$1} = [ $2 ]; |