mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-email: handle to/cc/bcc from --compose message

Browse Source 
If the user writes a message via --compose, send-email will pick up
various headers like "From", "Subject", etc and use them for other
patches as if they were specified on the command-line. But we don't
handle "To", "Cc", or "Bcc" this way; we just tell the user "those
aren't interpeted yet" and ignore them.

But it seems like an obvious thing to want, especially as the same
feature exists when the cover letter is generated separately by
format-patch. There it is gated behind the --to-cover option, but I
don't think we'd need the same control here; since we generate the
--compose template ourselves based on the existing input, if the user
leaves the lines unchanged then the behavior remains the same.

So let's fill in the implementation; like those other headers we already
handle, we just need to assign to the initial_* variables. The only
difference in this case is that they are arrays, so we'll feed them
through parse_address_line() to split them (just like we would when
reading a single string via prompting).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-10-20 06:15:24 -04:00
committed by Junio C Hamano
parent 637e8944a1
commit 3ec6167567
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
git-send-email.perl
View File

@ -861,6 +861,9 @@ if ($compose) {
my $tpl_subject = $initial_subject || '';
my $tpl_in_reply_to = $initial_in_reply_to || '';
my $tpl_reply_to = $reply_to || '';
my $tpl_to = join(',', @initial_to);
my $tpl_cc = join(',', @initial_cc);
my $tpl_bcc = join(', ', @initial_bcc);
print $c <<EOT1, Git::prefix_lines("GIT: ", __(<<EOT2)), <<EOT3;
From $tpl_sender # This line is ignored.
@ -872,6 +875,9 @@ for the patch you are writing.
Clear the body content if you don't wish to send a summary.
EOT2
From: $tpl_sender
To: $tpl_to
Cc: $tpl_cc
Bcc: $tpl_bcc
Reply-To: $tpl_reply_to
Subject: $tpl_subject
In-Reply-To: $tpl_in_reply_to
@ -928,8 +934,14 @@ EOT3
} elsif (/^From:\s*(.+)\s*$/i) {
$sender = $1;
next;
} elsif (/^(?:To|Cc|Bcc):/i) {
print __("To/Cc/Bcc fields are not interpreted yet, they have been ignored\n");
} elsif (/^To:\s*(.+)\s*$/i) {
@initial_to = parse_address_line($1);
next;
} elsif (/^Cc:\s*(.+)\s*$/i) {
@initial_cc = parse_address_line($1);
next;
} elsif (/^Bcc:/i) {
@initial_bcc = parse_address_line($1);
next;
}
print $c2 $_;