As alias file formats supported by git send-email doesn't take
whitespace into account, it is useless to consider whitespaces in
alias name. remove leading and trailing whitespace before expanding
allow to recognize strings like " alias" or "alias\t" passed by --to,
--cc, --bcc options or by the git send-email prompt.
Signed-off-by: Remi Lespinet <remi.lespi...@ensimag.grenoble-inp.fr>
---
git-send-email.perl | 1 +
t/t9001-send-email.sh | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/git-send-email.perl b/git-send-email.perl
index 3d144bd..34c8b8b 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -787,6 +787,7 @@ sub expand_aliases {
my %EXPANDED_ALIASES;
sub expand_one_alias {
my $alias = shift;
+ $alias =~ s/^\s+|\s+$//g;
if ($EXPANDED_ALIASES{$alias}) {
die "fatal: alias '$alias' expands to itself\n";
}
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 9aee474..bbfed56 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1692,4 +1692,28 @@ test_expect_success $PREREQ 'aliases work with email
list' '
test_cmp expected-list actual-list
'
+test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
+ echo "alias to2 t...@example.com" >.mutt &&
+ echo "alias cc1 Cc 1 <c...@example.com>" >>.mutt &&
+ test_config sendemail.aliasesfile ".mutt" &&
+ test_config sendemail.aliasfiletype mutt &&
+ TO1=$(echo "QTo 1 <t...@example.com>" | q_to_tab) &&
+ TO2=$(echo "QZto2" | qz_to_tab_space) &&
+ CC1=$(echo "cc1" | append_cr) &&
+ BCC1=$(echo "Q b...@example.com Q" | q_to_nul) &&
+ git send-email \
+ --dry-run \
+ --from=" Example <f...@example.com>" \
+ --to="$TO1" \
+ --to="$TO2" \
+ --to=" t...@example.com " \
+ --cc="$CC1" \
+ --cc="Cc2 <c...@example.com>" \
+ --bcc="$BCC1" \
+ --bcc="b...@example.com" \
+ 0001-add-master.patch | replace_variable_fields \
+ >actual-list &&
+ test_cmp expected-list actual-list
+'
+
test_done
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
