git-add -u: do not barf on type changes

diff --git a/git-send-email.perl b/git-send-email.perl
index 4767249e6d9ef25a6618e99a2557cd909be1573c..195fe6f70a3a13c17b67ad8d067e8e0ff4cc9195 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -21,8 +21,11 @@
 use Term::ReadLine;
 use Getopt::Long;
 use Data::Dumper;
+use Term::ANSIColor;
 use Git;
 
+$SIG{INT} = sub { print color("reset"), "\n"; exit };
+
 package FakeTerm;
 sub new {
        my ($class, $reason) = @_;
@@ -314,7 +317,8 @@ sub expand_aliases {
        } while (!defined $_);
 
        $initial_reply_to = $_;
-       $initial_reply_to =~ s/(^\s+|\s+$)//g;
+       $initial_reply_to =~ s/^\s+<?/</;
+       $initial_reply_to =~ s/>?\s+$/>/;
 }
 
 if (!$smtp_server) {