branch -d: base the "already-merged" safety on the branch it merges with

diff --git a/git-send-email.perl b/git-send-email.perl
index 6bd4bbc81a33b7402b5152342e4daac3ce89c0a4..e05455f74c7e23c28cae41b68fa80df87c633ce9 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -71,7 +71,7 @@ sub usage {
     --suppress-cc           <str>  * author, self, sob, cc, cccmd, body, bodycc, all.
     --[no-]signed-off-by-cc        * Send to Signed-off-by: addresses. Default on.
     --[no-]suppress-from           * Send to self. Default off.
-    --[no-]chain-reply-to          * Chain In-Reply-To: fields. Default on.
+    --[no-]chain-reply-to          * Chain In-Reply-To: fields. Default off.
     --[no-]thread                  * Use In-Reply-To: field. Default on.
 
   Administering:
@@ -221,10 +221,10 @@ sub chain_reply_to {
        if (defined $chain_reply_to &&
            $chain_reply_to eq $not_set_by_user) {
                print STDERR
-                   "In git 1.7.0, the default will be changed to --no-chain-reply-to\n" .
+                   "In git 1.7.0, the default has changed to --no-chain-reply-to\n" .
                    "Set sendemail.chainreplyto configuration variable to true if\n" .
                    "you want to keep --chain-reply-to as your default.\n";
-               $chain_reply_to = 1;
+               $chain_reply_to = 0;
        }
        return $chain_reply_to;
 }
@@ -877,7 +877,9 @@ sub send_message
 
        my @sendmail_parameters = ('-i', @recipients);
        my $raw_from = $sanitized_sender;
-       $raw_from = $envelope_sender if (defined $envelope_sender);
+       if (defined $envelope_sender && $envelope_sender ne "auto") {
+               $raw_from = $envelope_sender;
+       }
        $raw_from = extract_valid_address($raw_from);
        unshift (@sendmail_parameters,
                        '-f', $raw_from) if(defined $envelope_sender);