git-quiltimport: better parser to grok "enhanced" series files.

diff --git a/git-send-email.perl b/git-send-email.perl
index 6c72952fcc09934a4e710be733b4926a9e5a2658..e5d67f1b6c3237ff67673037be5ca8997cdb191d 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -166,7 +166,9 @@ sub format_2822_time {
 
 my $repo = Git->repository();
 my $term = eval {
-       new Term::ReadLine 'git-send-email';
+       $ENV{"GIT_SEND_EMAIL_NOTTY"}
+               ? new Term::ReadLine 'git-send-email', \*STDIN, \*STDOUT
+               : new Term::ReadLine 'git-send-email';
 };
 if ($@) {
        $term = new FakeTerm "$@: going non-interactive";
@@ -406,9 +408,10 @@ sub expand_aliases {
 
        $initial_reply_to = $_;
 }
-if (defined $initial_reply_to && $_ ne "") {
-       $initial_reply_to =~ s/^\s*<?/</;
-       $initial_reply_to =~ s/>?\s*$/>/;
+if (defined $initial_reply_to) {
+       $initial_reply_to =~ s/^\s*<?//;
+       $initial_reply_to =~ s/>?\s*$//;
+       $initial_reply_to = "<$initial_reply_to>" if $initial_reply_to ne '';
 }
 
 if (!defined $smtp_server) {
@@ -462,7 +465,7 @@ sub expand_aliases {
                exit(0);
        }
 
-       @files = ($compose_filename . ".final");
+       @files = ($compose_filename . ".final", @files);
 }
 
 # Variables we set as part of the loop over files