Skip to content

Commit 193d716

Browse files
Awaryngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b5e112d commit 193d716

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-send-email.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,6 @@ sub split_addrs {
530530
}
531531
}
532532

533-
($sender) = expand_aliases($sender) if defined $sender;
534-
535533
# is_format_patch_arg($f) returns 0 if $f names a patch, or 1 if
536534
# $f is a revision list specification to be passed to format-patch.
537535
sub is_format_patch_arg {
@@ -776,6 +774,8 @@ sub file_declares_8bit_cte {
776774
}
777775
}
778776

777+
($sender) = expand_aliases($sender) if defined $sender;
778+
779779
if (!defined $sender) {
780780
$sender = $repoauthor || $repocommitter || '';
781781
}

0 commit comments

Comments
 (0)