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

[Remi Lespinet]

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.lespi...@ensimag.grenoble-inp.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 2d5c530..f61449d 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -555,8 +555,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 {
@@ -801,6 +799,8 @@ if (!$force) {
        }
 }
 
+($sender) = expand_aliases($sender) if defined $sender;
+
 if (!defined $sender) {
        $sender = $repoauthor || $repocommitter || '';
 }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe git" in