Do not fall back on vi on dumb terminals.

diff --git a/git-send-email.perl b/git-send-email.perl
index ec1428d961206f12e195274aea6ea3ae52374898..2977b9adebff3180f156327622a9a11067e01696 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -34,7 +34,7 @@
 my (@to,@cc,$initial_reply_to,$initial_subject,@files,$from,$compose);
 
 # Behavior modification variables
-my ($chain_reply_to, $smtp_server) = (1, "localhost");
+my ($chain_reply_to, $smtp_server, $quiet) = (1, "localhost", 0);
 
 # Example reply to:
 #$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
@@ -51,6 +51,7 @@
                    "chain-reply-to!" => \$chain_reply_to,
                    "smtp-server=s" => \$smtp_server,
                    "compose" => \$compose,
+                   "quiet" => \$quiet,
         );
 
 # Now, let's fill any that aren't set in with defaults:
@@ -125,7 +126,7 @@
        # effort to have it be unique
        open(C,">",$compose_filename)
                or die "Failed to open for writing $compose_filename: $!";
-       print C "From \n";
+       print C "From $from # This line is ignored.\n";
        printf C "Subject: %s\n\n", $initial_subject;
        printf C <<EOT;
 GIT: Please enter your email below.
@@ -267,8 +268,10 @@ sub send_message
 
        sendmail(%mail) or die $Mail::Sendmail::error;
 
-       print "OK. Log says:\n", $Mail::Sendmail::log;
-       print "\n\n"
+       unless ($quiet) {
+               print "OK. Log says:\n", $Mail::Sendmail::log;
+               print "\n\n"
+       }
 }