undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-email: rename variable for clarity

Browse Source 
The SMTP protocol has both, the 'Reply-To' and the 'In-Reply-To' header
fields. We only use the latter. To avoid confusion, rename the variable
for it.

Signed-off-by: Christian Ludwig <chrissicool@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Ludwig 2018-03-04 00:58:13 +01:00 committed by Junio C Hamano
parent b6049542b9
commit 15dc3b9161
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
git-send-email.perl
View File

@ -166,13 +166,13 @@ my $re_encoded_word = qr/=\?($re_token)\?($re_token)\?($re_encoded_text)\?=/;
# Variables we fill in automatically, or via prompting: # Variables we fill in automatically, or via prompting:
my (@to,$no_to,@initial_to,@cc,$no_cc,@initial_cc,@bcclist,$no_bcc,@xh, my (@to,$no_to,@initial_to,@cc,$no_cc,@initial_cc,@bcclist,$no_bcc,@xh,
$initial_reply_to,$initial_subject,@files, $initial_in_reply_to,$initial_subject,@files,
$author,$sender,$smtp_authpass,$annotate,$use_xmailer,$compose,$time); $author,$sender,$smtp_authpass,$annotate,$use_xmailer,$compose,$time);
my $envelope_sender; my $envelope_sender;
# Example reply to: # Example reply to:
#$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>'; #$initial_in_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
my $repo = eval { Git->repository() }; my $repo = eval { Git->repository() };
my @repo = $repo ? ($repo) : (); my @repo = $repo ? ($repo) : ();
@ -314,7 +314,7 @@ die __("--dump-aliases incompatible with other options\n")
if !$help and $dump_aliases and @ARGV; if !$help and $dump_aliases and @ARGV;
$rc = GetOptions( $rc = GetOptions(
"sender|from=s" => \$sender, "sender|from=s" => \$sender,
"in-reply-to=s" => \$initial_reply_to, "in-reply-to=s" => \$initial_in_reply_to,
"subject=s" => \$initial_subject, "subject=s" => \$initial_subject,
"to=s" => \@initial_to, "to=s" => \@initial_to,
"to-cmd=s" => \$to_cmd, "to-cmd=s" => \$to_cmd,
@ -676,7 +676,7 @@ if ($compose) {
my $tpl_sender = $sender || $repoauthor || $repocommitter || ''; my $tpl_sender = $sender || $repoauthor || $repocommitter || '';
my $tpl_subject = $initial_subject || ''; my $tpl_subject = $initial_subject || '';
my $tpl_reply_to = $initial_reply_to || ''; my $tpl_in_reply_to = $initial_in_reply_to || '';
print $c <<EOT1, Git::prefix_lines("GIT: ", __ <<EOT2), <<EOT3; print $c <<EOT1, Git::prefix_lines("GIT: ", __ <<EOT2), <<EOT3;
From $tpl_sender # This line is ignored. From $tpl_sender # This line is ignored.
@ -689,7 +689,7 @@ Clear the body content if you don't wish to send a summary.
EOT2 EOT2
From: $tpl_sender From: $tpl_sender
Subject: $tpl_subject Subject: $tpl_subject
In-Reply-To: $tpl_reply_to In-Reply-To: $tpl_in_reply_to
EOT3 EOT3
for my $f (@files) { for my $f (@files) {
@ -728,7 +728,7 @@ EOT3
$sender = delete($parsed_email{'From'}); $sender = delete($parsed_email{'From'});
} }
if ($parsed_email{'In-Reply-To'}) { if ($parsed_email{'In-Reply-To'}) {
$initial_reply_to = delete($parsed_email{'In-Reply-To'}); $initial_in_reply_to = delete($parsed_email{'In-Reply-To'});
} }
if ($parsed_email{'Subject'}) { if ($parsed_email{'Subject'}) {
$initial_subject = delete($parsed_email{'Subject'}); $initial_subject = delete($parsed_email{'Subject'});
@ -911,16 +911,16 @@ sub expand_one_alias {
@initial_cc = process_address_list(@initial_cc); @initial_cc = process_address_list(@initial_cc);
@bcclist = process_address_list(@bcclist); @bcclist = process_address_list(@bcclist);
if ($thread && !defined $initial_reply_to && $prompting) { if ($thread && !defined $initial_in_reply_to && $prompting) {
$initial_reply_to = ask( $initial_in_reply_to = ask(
__("Message-ID to be used as In-Reply-To for the first email (if any)? "), __("Message-ID to be used as In-Reply-To for the first email (if any)? "),
default => "", default => "",
valid_re => qr/\@.*\./, confirm_only => 1); valid_re => qr/\@.*\./, confirm_only => 1);
} }
if (defined $initial_reply_to) { if (defined $initial_in_reply_to) {
$initial_reply_to =~ s/^\s*<?//; $initial_in_reply_to =~ s/^\s*<?//;
$initial_reply_to =~ s/>?\s*$//; $initial_in_reply_to =~ s/>?\s*$//;
$initial_reply_to = "<$initial_reply_to>" if $initial_reply_to ne ''; $initial_in_reply_to = "<$initial_in_reply_to>" if $initial_in_reply_to ne '';
} }
if (!defined $smtp_server) { if (!defined $smtp_server) {
@ -940,7 +940,7 @@ if ($compose && $compose > 0) {
} }
# Variables we set as part of the loop over files # Variables we set as part of the loop over files
our ($message_id, %mail, $subject, $reply_to, $references, $message, our ($message_id, %mail, $subject, $in_reply_to, $references, $message,
$needs_confirm, $message_num, $ask_default); $needs_confirm, $message_num, $ask_default);
sub extract_valid_address { sub extract_valid_address {
@ -1349,9 +1349,9 @@ Message-Id: $message_id
if ($use_xmailer) { if ($use_xmailer) {
$header .= "X-Mailer: git-send-email $gitversion\n"; $header .= "X-Mailer: git-send-email $gitversion\n";
} }
if ($reply_to) { if ($in_reply_to) {
$header .= "In-Reply-To: $reply_to\n"; $header .= "In-Reply-To: $in_reply_to\n";
$header .= "References: $references\n"; $header .= "References: $references\n";
} }
if (@xh) { if (@xh) {
@ -1528,8 +1528,8 @@ EOF
return 1; return 1;
} }
$reply_to = $initial_reply_to; $in_reply_to = $initial_in_reply_to;
$references = $initial_reply_to || ''; $references = $initial_in_reply_to || '';
$subject = $initial_subject; $subject = $initial_subject;
$message_num = 0; $message_num = 0;
@ -1739,9 +1739,9 @@ foreach my $t (@files) {
# set up for the next message # set up for the next message
if ($thread && $message_was_sent && if ($thread && $message_was_sent &&
($chain_reply_to || !defined $reply_to || length($reply_to) == 0 || ($chain_reply_to || !defined $in_reply_to || length($in_reply_to) == 0 ||
$message_num == 1)) { $message_num == 1)) {
$reply_to = $message_id; $in_reply_to = $message_id;
if (length $references > 0) { if (length $references > 0) {
$references .= "\n $message_id"; $references .= "\n $message_id";
} else { } else {