git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
To: git@vger.kernel.org
Cc: Remi Galan <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
	Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
	Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
	Louis-Alexandre Stuber 
	<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
	Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: [PATCH v6 10/10] send-email: suppress meaningless whitespaces in from field
Date: Tue, 23 Jun 2015 22:41:54 +0200	[thread overview]
Message-ID: <1435092114-10139-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <1435091416-9394-1-git-send-email-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>
---
 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 8bf6656..749d809 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -786,6 +786,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 3c5b853..8e21fb0 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1719,4 +1719,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
-- 
1.9.1

      parent reply	other threads:[~2015-06-23 20:42 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-17 14:18 [PATCH/RFC v4 01/10] t9001-send-email: move script creation in a setup test Remi Lespinet
2015-06-17 14:18 ` [PATCH/RFC v4 02/10] send-email: allow aliases in patch header and command script outputs Remi Lespinet
2015-06-17 14:18 ` [PATCH/RFC v4 03/10] t9001-send-email: refactor header variable fields replacement Remi Lespinet
2015-06-17 14:18 ` [PATCH/RFC v4 04/10] send-email: refactor address list process Remi Lespinet
2015-06-17 14:18 ` [PATCH/RFC v4 05/10] send-email: Allow use of aliases in the From field of --compose mode Remi Lespinet
2015-06-17 15:57   ` Matthieu Moy
2015-06-17 14:18 ` [PATCH/RFC v4 06/10] send-email: minor code refactoring Remi Lespinet
2015-06-17 14:18 ` [PATCH/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line Remi Lespinet
2015-06-17 15:45   ` Matthieu Moy
2015-06-17 23:39     ` Remi Lespinet
2015-06-17 21:27   ` Junio C Hamano
2015-06-17 23:48     ` Remi Lespinet
2015-06-18 11:39       ` Matthieu Moy
2015-06-18 15:08         ` Remi Lespinet
2015-06-18 17:29           ` Matthieu Moy
2015-06-18 21:29             ` Remi Lespinet
2015-06-19  7:16               ` Matthieu Moy
2015-06-17 14:30 ` [PATCH/RFC v4 08/10] send-email: consider quote as delimiter instead of character Remi Lespinet
2015-06-17 14:31 ` [PATCH/RFC v4 09/10] send-email: allow multiple emails using --cc, --to and --bcc Remi Lespinet
2015-06-17 14:32 ` [PATCH/RFC v4 10/10] send-email: suppress meaningless whitespaces in from field Remi Lespinet
2015-06-17 14:54   ` Matthieu Moy
2015-06-17 15:11     ` Remi Lespinet
2015-06-20 23:17 ` [PATCH v5 01/10] t9001-send-email: move script creation in a setup test Remi Lespinet
2015-06-20 23:17   ` [PATCH v5 02/10] send-email: allow aliases in patch header and command script outputs Remi Lespinet
2015-06-20 23:17   ` [PATCH v5 03/10] t9001-send-email: refactor header variable fields replacement Remi Lespinet
2015-06-20 23:17   ` [PATCH v5 04/10] send-email: refactor address list process Remi Lespinet
2015-06-20 23:17   ` [PATCH v5 05/10] send-email: Allow use of aliases in the From field of --compose mode Remi Lespinet
2015-06-20 23:17   ` [PATCH v5 06/10] send-email: minor code refactoring Remi Lespinet
2015-06-20 23:17   ` [PATCH v5 07/10] send-email: reduce dependancies impact on parse_address_line Remi Lespinet
2015-06-21 10:07     ` Matthieu Moy
2015-06-21 13:02       ` Remi Lespinet
2015-06-23 20:15       ` Remi Lespinet
2015-06-21 13:24     ` Matthieu Moy
2015-06-21 12:45 ` [PATCH v5 08/10] send-email: consider quote as delimiter instead of character Remi Lespinet
2015-06-21 12:45   ` [PATCH v5 09/10] send-email: allow multiple emails using --cc, --to and --bcc Remi Lespinet
2015-06-21 13:17     ` Matthieu Moy
2015-06-21 12:45   ` [PATCH v5 10/10] send-email: suppress meaningless whitespaces in from field Remi Lespinet
2015-06-23 20:30 ` [PATCH v6 01/10] t9001-send-email: move script creation in a setup test Remi Lespinet
2015-06-23 20:30   ` [PATCH v6 02/10] send-email: allow aliases in patch header and command script outputs Remi Lespinet
2015-06-23 20:30   ` [PATCH v6 03/10] t9001-send-email: refactor header variable fields replacement Remi Lespinet
2015-06-23 20:30   ` [PATCH v6 04/10] send-email: refactor address list process Remi Lespinet
2015-06-23 20:30   ` [PATCH v6 05/10] send-email: Allow use of aliases in the From field of --compose mode Remi Lespinet
2015-06-23 20:30   ` [PATCH v6 06/10] send-email: minor code refactoring Remi Lespinet
2015-06-23 20:30   ` [PATCH v6 07/10] send-email: reduce dependencies impact on parse_address_line Remi Lespinet
2015-06-23 20:39     ` Matthieu Moy
2015-06-23 20:58       ` Remi LESPINET
2015-06-23 20:40   ` [PATCH v6 08/10] send-email: consider quote as delimiter instead of character Remi Lespinet
2015-06-23 20:41   ` [PATCH v6 09/10] send-email: allow multiple emails using --cc, --to and --bcc Remi Lespinet
2015-06-23 20:44     ` Matthieu Moy
2015-06-23 20:41   ` Remi Lespinet [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=1435092114-10139-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr \
    --to=remi.lespinet@ensimag.grenoble-inp.fr \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=antoine.delaite@ensimag.grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=guillaume.pages@ensimag.grenoble-inp.fr \
    --cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
    --cc=remi.galan-alfonso@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).