Trace into open fd and refactor tracing code.

[git.git] / git-send-email.perl

diff --git a/git-send-email.perl b/git-send-email.perl
index c9c1975b7f7dd25ef8d5e3dd475b56cb624592bd..746c525079317491e35827f331922e17e5fbd089 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -361,7 +361,7 @@ Options:
    --smtp-server  If set, specifies the outgoing SMTP server to use.
                   Defaults to localhost.
 
-  --suppress-from Supress sending emails to yourself if your address
+  --suppress-from Suppress sending emails to yourself if your address
                   appears in a From: line.
 
    --quiet     Make git-send-email less verbose.  One line per email should be
@@ -435,7 +435,6 @@ sub send_message
 To: $to
 Cc: $cc
 Subject: $subject
-Reply-To: $from
 Date: $date
 Message-Id: $message_id
 X-Mailer: git-send-email $gitversion
@@ -511,7 +510,7 @@ foreach my $t (@files) {
                                        if ($2 eq $from) {
                                                next if ($suppress_from);
                                        }
-                                       else {
+                                       elsif ($1 eq 'From') {
                                                $author_not_sender = $2;
                                        }
                                        printf("(mbox) Adding cc: %s from line '%s'\n",