[PATCH v7 05/10] send-email: allow use of aliases in the From field of --compose mode

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Jun 30, 2015, 12:16 UTC
Message-ID: <1435666611-18429-6-git-send-email-Matthieu.Moy@imag.fr>
In-Reply-To: <1435666611-18429-1-git-send-email-Matthieu.Moy@imag.fr>

From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>

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>
---
 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 994697e..da1d4a4 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -561,8 +561,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 {
@@ -807,6 +805,8 @@ if (!$force) {
 	}
 }
 
+($sender) = expand_aliases($sender) if defined $sender;
+
 if (!defined $sender) {
 	$sender = $repoauthor || $repocommitter || '';
 }

-- 
2.5.0.rc0.10.g7792c2a