From: Remi Lespinet <[email protected]> Remove leading and trailing whitespaces in from field before interepreting it to improve consistency with other options. The split_addrs function already take care of trailing and leading whitespaces for to, cc and bcc fields. The from option now:
- has the same behavior when passing arguments like " [email protected] ", "\t [email protected] " or "[email protected]". - interprets aliases in string containing leading and trailing whitespaces such as " alias" or "alias\t" like other options. Signed-off-by: Remi Lespinet <[email protected]> Signed-off-by: Matthieu Moy <[email protected]> --- 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 4a681f5..b660cc2 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -792,6 +792,7 @@ if (!$force) { } if (defined $sender) { + $sender =~ s/^\s+|\s+$//g; ($sender) = expand_aliases($sender); } else { $sender = $repoauthor || $repocommitter || ''; diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 733431b..5b4a5ce 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1764,4 +1764,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 [email protected]" >.mutt && + echo "alias cc1 Cc 1 <[email protected]>" >>.mutt && + test_config sendemail.aliasesfile ".mutt" && + test_config sendemail.aliasfiletype mutt && + TO1=$(echo "QTo 1 <[email protected]>" | q_to_tab) && + TO2=$(echo "QZto2" | qz_to_tab_space) && + CC1=$(echo "cc1" | append_cr) && + BCC1=$(echo "Q [email protected] Q" | q_to_nul) && + git send-email \ + --dry-run \ + --from=" Example <[email protected]>" \ + --to="$TO1" \ + --to="$TO2" \ + --to=" [email protected] " \ + --cc="$CC1" \ + --cc="Cc2 <[email protected]>" \ + --bcc="$BCC1" \ + --bcc="[email protected]" \ + 0001-add-master.patch | replace_variable_fields \ + >actual-list && + test_cmp expected-list actual-list +' + test_done -- 2.5.0.rc0.10.g7792c2a -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
