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@xxxxxxxxxxx>, mike@xxxxxxxxxxx'
However format using commas in names doesn't work:
$ git send-email --to='"Jane, Doe" <jdoe@xxxxxxxxxxx>'
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@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@xxxxxxxxxxxxxxx>
Signed-off-by: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@xxxxxxxxxxxxxxx>
Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx>
Signed-off-by: Remi Lespinet <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx>
---
Documentation/git-send-email.txt | 21 +++++++++++++++------
git-send-email.perl | 33 ++++++++++++++-------------------
t/t9001-send-email.sh | 30 ++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 25 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 043f345..f862fa6 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -49,17 +49,23 @@ 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.
+Addresses containing commas ("Foo, Bar" <foobar@xxxxxxxxxxx>) are not
+currently supported.
++
+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.
+Addresses containing commas ("Foo, Bar" <foobar@xxxxxxxxxxx>) are not
+currently supported.
++
+This option may be specified multiple times
--compose::
Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1])
@@ -110,13 +116,16 @@ 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.
+Addresses containing commas ("Foo, Bar" <foobar@xxxxxxxxxxx>) are not
+currently supported.
++
+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 ffea500..389f19c 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]);
@@ -838,11 +824,11 @@ sub expand_one_alias {
}
@initial_to = expand_aliases(@initial_to);
-@initial_to = validate_address_list(sanitize_address_list(@initial_to));
+@initial_to = extract_address_list(@initial_to);
@initial_cc = expand_aliases(@initial_cc);
-@initial_cc = validate_address_list(sanitize_address_list(@initial_cc));
+@initial_cc = extract_address_list(@initial_cc);
@bcclist = expand_aliases(@bcclist);
-@bcclist = validate_address_list(sanitize_address_list(@bcclist));
+@bcclist = extract_address_list(@bcclist);
if ($thread && !defined $initial_reply_to && $prompting) {
$initial_reply_to = ask(
@@ -1055,6 +1041,15 @@ sub sanitize_address_list {
return (map { sanitize_address($_) } @_);
}
+sub split_address_list_items {
+ return (map { split /\s*,\s*/, $_ } @_);
+}
+
+sub extract_address_list {
+ return validate_address_list(sanitize_address_list(
+ split_address_list_items(@_)));
+}
+
# Returns the local Fully Qualified Domain Name (FQDN) if available.
#
# Tightly configured MTAa require that a caller sends a real DNS
@@ -1564,8 +1559,8 @@ foreach my $t (@files) {
($confirm =~ /^(?:auto|compose)$/ && $compose && $message_num == 1));
$needs_confirm = "inform" if ($needs_confirm && $confirm_unconfigured && @cc);
- @to = validate_address_list(sanitize_address_list(@to));
- @cc = validate_address_list(sanitize_address_list(@cc));
+ @to = extract_address_list(@to);
+ @cc = extract_address_list(@cc);
@to = (@initial_to, @to);
@cc = (@initial_cc, @cc);
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 71968ee..4245c06 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1612,4 +1612,34 @@ 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@xxxxxxxxxxx>" \
+ --to="to1@xxxxxxxxxxx" \
+ --to="to2@xxxxxxxxxxx" \
+ --to="to3@xxxxxxxxxxx" \
+ --cc="cc1@xxxxxxxxxxx" \
+ --cc="Cc 1 <cc1@xxxxxxxxxxx>" \
+ --cc="Cc 2 <cc2@xxxxxxxxxxx>" \
+ --bcc="bcc1@xxxxxxxxxxx" \
+ --bcc="bcc2@xxxxxxxxxxx" \
+ 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@xxxxxxxxxxx>" \
+ --to="to1@xxxxxxxxxxx, to2@xxxxxxxxxxx" \
+ --to="to3@xxxxxxxxxxx" \
+ --cc="cc1@xxxxxxxxxxx, Cc 1 <cc1@xxxxxxxxxxx>" \
+ --cc="Cc 2 <cc2@xxxxxxxxxxx>" \
+ --bcc="bcc1@xxxxxxxxxxx, bcc2@xxxxxxxxxxx" \
+ 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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html