From 193d7160111ebf5b898f53240c33c1e4101d9598 Mon Sep 17 00:00:00 2001 From: Remi Lespinet Date: Tue, 30 Jun 2015 14:16:46 +0200 Subject: [PATCH] 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 Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- git-send-email.perl | 4 ++-- 1 file 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 || ''; } -- 2.11.4.GIT