git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 09/10] send-email: allow multiple emails using --cc, --to and --bcc

From
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Date
Jun 21, 2015, 12:45 UTC
Message-ID
<1434890756-5059-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>
In-Reply-To
<1434890756-5059-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>

Accept a list of emails separated by commas in flags --cc, --to and --bcc. Multiple addresses can already be given by using these options multiple times, but it is more convenient to allow cutting-and-pasting a list of addresses from the header of an existing e-mail message, which already lists them as comma-separated list, as a value to a single parameter.

The following format can now be used:
    $ git send-email --to='Jane <jdoe@example.com>, mike@example.com'

Remove the limitation imposed by 79ee555b (Check and document the options to prevent mistakes, 2006-06-21) which rejected every argument with comma in --cc, --to and --bcc.

Helped-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>
Signed-off-by: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
---
 Documentation/git-send-email.txt | 12 +++++------
 git-send-email.perl              | 17 ++--------------
 t/t9001-send-email.sh            | 44 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index b48a764..afd9569 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -49,17 +49,17 @@ Composing
 	of 'sendemail.annotate'. See the CONFIGURATION section for
 	'sendemail.multiEdit'.
 
---bcc=<address>::
+--bcc=<address>,...::
 	Specify a "Bcc:" value for each email. Default is the value of
 	'sendemail.bcc'.
 +
-The --bcc option must be repeated for each user you want on the bcc list.
+This option may be specified multiple times.
 
---cc=<address>::
+--cc=<address>,...::
 	Specify a starting "Cc:" value for each email.
 	Default is the value of 'sendemail.cc'.
 +
-The --cc option must be repeated for each user you want on the cc list.
+This option may be specified multiple times.
 
 --compose::
 	Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1])
@@ -110,13 +110,13 @@ is not set, this will be prompted for.
 	Only necessary if --compose is also set.  If --compose
 	is not set, this will be prompted for.
 
---to=<address>::
+--to=<address>,...::
 	Specify the primary recipient of the emails generated. Generally, this
 	will be the upstream maintainer of the project involved. Default is the
 	value of the 'sendemail.to' configuration value; if that is unspecified,
 	and --to-cmd is not specified, this will be prompted for.
 +
-The --to option must be repeated for each user you want on the to list.
+This option may be specified multiple times.
 
 --8bit-encoding=<encoding>::
 	When encountering a non-ASCII message or subject that does not
diff --git a/git-send-email.perl b/git-send-email.perl
index a03392c..8bf6656 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -460,20 +460,6 @@ my ($repoauthor, $repocommitter);
 ($repoauthor) = Git::ident_person(@repo, 'author');
 ($repocommitter) = Git::ident_person(@repo, 'committer');
 
-# Verify the user input
-
-foreach my $entry (@initial_to) {
-	die "Comma in --to entry: $entry'\n" unless $entry !~ m/,/;
-}
-
-foreach my $entry (@initial_cc) {
-	die "Comma in --cc entry: $entry'\n" unless $entry !~ m/,/;
-}
-
-foreach my $entry (@bcclist) {
-	die "Comma in --bcclist entry: $entry'\n" unless $entry !~ m/,/;
-}
-
 sub parse_address_line {
 	if ($have_mail_address) {
 		return map { $_->format } Mail::Address->parse($_[0]);
@@ -1051,7 +1037,8 @@ sub sanitize_address_list {
 }
 
 sub process_address_list {
-	my @addr_list = expand_aliases(@_);
+	my @addr_list = map { parse_address_line($_) } @_;
+	@addr_list = expand_aliases(@addr_list);
 	@addr_list = sanitize_address_list(@addr_list);
 	@addr_list = validate_address_list(@addr_list);
 	return @addr_list;
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 714fcae..3c5b853 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1675,4 +1675,48 @@ test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=false' '
 	do_xmailer_test 1 "--xmailer"
 '
 
+test_expect_success $PREREQ 'setup expected-list' '
+	git send-email \
+	--dry-run \
+	--from="Example <from@example.com>" \
+	--to="To 1 <to1@example.com>" \
+	--to="to2@example.com" \
+	--to="to3@example.com" \
+	--cc="Cc 1 <cc1@example.com>" \
+	--cc="Cc2 <cc2@example.com>" \
+	--bcc="bcc1@example.com" \
+	--bcc="bcc2@example.com" \
+	0001-add-master.patch | replace_variable_fields \
+	>expected-list
+'
+
+test_expect_success $PREREQ 'use email list in --cc --to and --bcc' '
+	git send-email \
+	--dry-run \
+	--from="Example <from@example.com>" \
+	--to="To 1 <to1@example.com>, to2@example.com" \
+	--to="to3@example.com" \
+	--cc="Cc 1 <cc1@example.com>, Cc2 <cc2@example.com>" \
+	--bcc="bcc1@example.com, bcc2@example.com" \
+	0001-add-master.patch | replace_variable_fields \
+	>actual-list &&
+	test_cmp expected-list actual-list
+'
+
+test_expect_success $PREREQ 'aliases work with email list' '
+	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 &&
+	git send-email \
+	--dry-run \
+	--from="Example <from@example.com>" \
+	--to="To 1 <to1@example.com>, to2, to3@example.com" \
+	--cc="cc1, Cc2 <cc2@example.com>" \
+	--bcc="bcc1@example.com, bcc2@example.com" \
+	0001-add-master.patch | replace_variable_fields \
+	>actual-list &&
+	test_cmp expected-list actual-list
+'
+
 test_done

-- 
1.9.1
Previous: Remi LespinetNext: Matthieu Moy
Message 35 of 50 in “t9001-send-email: move script creation in a setup test”
  1. 01/10 t9001-send-email: move script creation in a setup testRemi Lespinet, Jun 17, 2015
  2. 02/10 send-email: allow aliases in patch header and command script outputsRemi Lespinet, Jun 17, 2015
  3. 03/10 t9001-send-email: refactor header variable fields replacementRemi Lespinet, Jun 17, 2015
  4. 04/10 send-email: refactor address list processRemi Lespinet, Jun 17, 2015
  5. 05/10 send-email: Allow use of aliases in the From field of --compose modeRemi Lespinet, Jun 17, 2015
  6. Matthieu MoyJun 17, 2015
  7. 06/10 send-email: minor code refactoringRemi Lespinet, Jun 17, 2015
  8. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 17, 2015
  9. Matthieu MoyJun 17, 2015
  10. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 17, 2015
  11. Junio C HamanoJun 17, 2015
  12. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 17, 2015
  13. Matthieu MoyJun 18, 2015
  14. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 18, 2015
  15. Matthieu MoyJun 18, 2015
  16. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 18, 2015
  17. Matthieu MoyJun 19, 2015
  18. 08/10 send-email: consider quote as delimiter instead of characterRemi Lespinet, Jun 17, 2015
  19. 09/10 send-email: allow multiple emails using --cc, --to and --bccRemi Lespinet, Jun 17, 2015
  20. 10/10 send-email: suppress meaningless whitespaces in from fieldRemi Lespinet, Jun 17, 2015
  21. Matthieu MoyJun 17, 2015
  22. 10/10 send-email: suppress meaningless whitespaces in from fieldRemi Lespinet, Jun 17, 2015
  23. 01/10 t9001-send-email: move script creation in a setup testRemi Lespinet, Jun 20, 2015
  24. 02/10 send-email: allow aliases in patch header and command script outputsRemi Lespinet, Jun 20, 2015
  25. 03/10 t9001-send-email: refactor header variable fields replacementRemi Lespinet, Jun 20, 2015
  26. 04/10 send-email: refactor address list processRemi Lespinet, Jun 20, 2015
  27. 05/10 send-email: Allow use of aliases in the From field of --compose modeRemi Lespinet, Jun 20, 2015
  28. 06/10 send-email: minor code refactoringRemi Lespinet, Jun 20, 2015
  29. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 20, 2015
  30. Matthieu MoyJun 21, 2015
  31. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 21, 2015
  32. 07/10 send-email: reduce dependancies impact on parse_address_lineRemi Lespinet, Jun 23, 2015
  33. Matthieu MoyJun 21, 2015
  34. 08/10 send-email: consider quote as delimiter instead of characterRemi Lespinet, Jun 21, 2015
  35. 09/10 send-email: allow multiple emails using --cc, --to and --bccRemi Lespinet, Jun 21, 2015
  36. Matthieu MoyJun 21, 2015
  37. 10/10 send-email: suppress meaningless whitespaces in from fieldRemi Lespinet, Jun 21, 2015
  38. 01/10 t9001-send-email: move script creation in a setup testRemi Lespinet, Jun 23, 2015
  39. 02/10 send-email: allow aliases in patch header and command script outputsRemi Lespinet, Jun 23, 2015
  40. 03/10 t9001-send-email: refactor header variable fields replacementRemi Lespinet, Jun 23, 2015
  41. 04/10 send-email: refactor address list processRemi Lespinet, Jun 23, 2015
  42. 05/10 send-email: Allow use of aliases in the From field of --compose modeRemi Lespinet, Jun 23, 2015
  43. 06/10 send-email: minor code refactoringRemi Lespinet, Jun 23, 2015
  44. 07/10 send-email: reduce dependencies impact on parse_address_lineRemi Lespinet, Jun 23, 2015
  45. Matthieu MoyJun 23, 2015
  46. 07/10 send-email: reduce dependencies impact on parse_address_lineRemi LESPINET, Jun 23, 2015
  47. 08/10 send-email: consider quote as delimiter instead of characterRemi Lespinet, Jun 23, 2015
  48. 09/10 send-email: allow multiple emails using --cc, --to and --bccRemi Lespinet, Jun 23, 2015
  49. Matthieu MoyJun 23, 2015
  50. 10/10 send-email: suppress meaningless whitespaces in from fieldRemi Lespinet, Jun 23, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.