From 40e6e8a0c485e618be366f13247fd745ac00b911 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 13 Apr 2009 13:23:50 -0500 Subject: send-email: Handle "GIT:" rather than "GIT: " during --compose This should make things a little more robust in terms of user input; before, even the program got it wrong by outputting a line with only "GIT:", which was left in place as a header, because there would be no following space character. Signed-off-by: Michael Witten Signed-off-by: Junio C Hamano --- git-send-email.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-send-email.perl') diff --git a/git-send-email.perl b/git-send-email.perl index 172b53c2d5..7526ade761 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -529,7 +529,7 @@ if ($compose) { print C <) { - next if m/^GIT: /; + next if m/^GIT:/; if ($in_body) { $summary_empty = 0 unless (/^\n$/); } elsif (/^\n$/) { -- cgit v1.2.3 From 15da10843135490e12efca7f8bc806ae0bcf5c53 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 13 Apr 2009 13:23:51 -0500 Subject: send-email: 'References:' should only reference what is sent If someone responded with a negative (n|no) to the confirmation, then the Message-ID of the discarded email is no longer used in the References: header of subsequent emails. Consequently, send_message() now returns 1 if the message was sent and 0 otherwise. Signed-off-by: Michael Witten Signed-off-by: Junio C Hamano --- git-send-email.perl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'git-send-email.perl') diff --git a/git-send-email.perl b/git-send-email.perl index 7526ade761..43f956b780 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -796,6 +796,10 @@ sub sanitize_address } +# Returns 1 if the message was sent, and 0 otherwise. +# In actuality, the whole program dies when a there +# is an error sending a message. + sub send_message { my @recipients = unique_email_list(@to); @@ -864,7 +868,7 @@ X-Mailer: git-send-email $gitversion default => $ask_default); die "Send this email reply required" unless defined $_; if (/^n/i) { - return; + return 0; } elsif (/^q/i) { cleanup_compose_files(); exit(0); @@ -945,7 +949,7 @@ X-Mailer: git-send-email $gitversion $smtp->data or die $smtp->message; $smtp->datasend("$header\n$message") or die $smtp->message; $smtp->dataend() or die $smtp->message; - $smtp->ok or die "Failed to send $subject\n".$smtp->message; + $smtp->code =~ /250|200/ or die "Failed to send $subject\n".$smtp->message; } if ($quiet) { printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject); @@ -966,6 +970,8 @@ X-Mailer: git-send-email $gitversion print "Result: OK\n"; } } + + return 1; } $reply_to = $initial_reply_to; @@ -1126,10 +1132,10 @@ foreach my $t (@files) { @cc = (@initial_cc, @cc); - send_message(); + my $message_was_sent = send_message(); # set up for the next message - if ($chain_reply_to || !defined $reply_to || length($reply_to) == 0) { + if ($message_was_sent and $chain_reply_to || not defined $reply_to || length($reply_to) == 0) { $reply_to = $message_id; if (length $references > 0) { $references .= "\n $message_id"; -- cgit v1.2.3 From bec99cfc679b8c754ddd03feeb691b4c054ccc6a Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 13 Apr 2009 13:23:52 -0500 Subject: send-email: Remove superfluous `my $editor = ...' Not only was it a repeat, but it also had no effect. Signed-off-by: Michael Witten Signed-off-by: Junio C Hamano --- git-send-email.perl | 2 -- 1 file changed, 2 deletions(-) (limited to 'git-send-email.perl') diff --git a/git-send-email.perl b/git-send-email.perl index 43f956b780..04267c58dd 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -544,8 +544,6 @@ EOT } close(C); - my $editor = $ENV{GIT_EDITOR} || Git::config(@repo, "core.editor") || $ENV{VISUAL} || $ENV{EDITOR} || "vi"; - if ($annotate) { do_edit($compose_filename, @files); } else { -- cgit v1.2.3