diff options
| author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | 2015-06-30 14:16:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-30 11:34:35 -0700 |
| commit | 193d7160111ebf5b898f53240c33c1e4101d9598 (patch) | |
| tree | a667a3cb7dc092e80c260802f6c29ac05db6e529 /git-send-email.perl | |
| parent | b5e112d8d240b299553f17c8e476ef16fca4001f (diff) | |
| download | git-193d7160111ebf5b898f53240c33c1e4101d9598.tar.gz | |
send-email: allow use of aliases in the From field of --compose mode
Aliases were expanded before considering the From field of the
--compose option. This is inconsistent with other fields
(To, Cc, ...) which already support aliases.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 05af83993b..228400b3e9 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -530,8 +530,6 @@ if (@alias_files and $aliasfiletype and defined $parse_alias{$aliasfiletype}) { } } -($sender) = expand_aliases($sender) if defined $sender; - # is_format_patch_arg($f) returns 0 if $f names a patch, or 1 if # $f is a revision list specification to be passed to format-patch. sub is_format_patch_arg { @@ -776,6 +774,8 @@ if (!$force) { } } +($sender) = expand_aliases($sender) if defined $sender; + if (!defined $sender) { $sender = $repoauthor || $repocommitter || ''; } |