From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, remi.lespinet@ensimag.grenoble-inp.fr,
guillaume.pages@ensimag.grenoble-inp.fr,
louis--alexandre.stuber@ensimag.grenoble-inp.fr,
antoine.delaite@ensimag.grenoble-inp.fr,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v7 10/10] send-email: suppress meaningless whitespaces in from field
Date: Tue, 30 Jun 2015 14:16:51 +0200 [thread overview]
Message-ID: <1435666611-18429-11-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1435666611-18429-1-git-send-email-Matthieu.Moy@imag.fr>
From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
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
" jdoe@example.com ", "\t jdoe@example.com " or
"jdoe@example.com".
- interprets aliases in string containing leading and trailing
whitespaces such as " alias" or "alias\t" like other options.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.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 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 to2@example.com" >.mutt &&
+ echo "alias cc1 Cc 1 <cc1@example.com>" >>.mutt &&
+ test_config sendemail.aliasesfile ".mutt" &&
+ test_config sendemail.aliasfiletype mutt &&
+ TO1=$(echo "QTo 1 <to1@example.com>" | q_to_tab) &&
+ TO2=$(echo "QZto2" | qz_to_tab_space) &&
+ CC1=$(echo "cc1" | append_cr) &&
+ BCC1=$(echo "Q bcc1@example.com Q" | q_to_nul) &&
+ git send-email \
+ --dry-run \
+ --from=" Example <from@example.com>" \
+ --to="$TO1" \
+ --to="$TO2" \
+ --to=" to3@example.com " \
+ --cc="$CC1" \
+ --cc="Cc2 <cc2@example.com>" \
+ --bcc="$BCC1" \
+ --bcc="bcc2@example.com" \
+ 0001-add-master.patch | replace_variable_fields \
+ >actual-list &&
+ test_cmp expected-list actual-list
+'
+
test_done
--
2.5.0.rc0.10.g7792c2a
prev parent reply other threads:[~2015-06-30 12:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 12:16 [PATCH v7 00/10] send-email address management Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 01/10] t9001-send-email: move script creation in a setup test Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 02/10] send-email: allow aliases in patch header and command script outputs Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 03/10] t9001-send-email: refactor header variable fields replacement Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 04/10] send-email: refactor address list process Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 05/10] send-email: allow use of aliases in the From field of --compose mode Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 06/10] send-email: minor code refactoring Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 07/10] send-email: reduce dependencies impact on parse_address_line Matthieu Moy
2015-06-30 18:41 ` Junio C Hamano
2015-06-30 19:36 ` Matthieu Moy
2015-06-30 19:43 ` Junio C Hamano
2015-07-01 7:51 ` Remi Lespinet
2015-07-01 8:33 ` Matthieu Moy
2015-07-07 9:37 ` Torsten Bögershausen
2015-07-07 13:27 ` Matthieu Moy
2015-07-07 13:38 ` [PATCH v8 " Matthieu Moy
2015-07-08 7:16 ` Torsten Bögershausen
2015-07-08 7:28 ` Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 08/10] send-email: consider quote as delimiter instead of character Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 09/10] send-email: allow multiple emails using --cc, --to and --bcc Matthieu Moy
2015-06-30 12:16 ` Matthieu Moy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435666611-18429-11-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).