1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00

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>
This commit is contained in:
Remi Lespinet 2015-06-30 14:16:46 +02:00 committed by Junio C Hamano
parent b5e112d8d2
commit 193d716011

View file

@ -530,8 +530,6 @@ sub split_addrs {
}
}
($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 @@ sub file_declares_8bit_cte {
}
}
($sender) = expand_aliases($sender) if defined $sender;
if (!defined $sender) {
$sender = $repoauthor || $repocommitter || '';
}