Merge branch 'ab/cond-skip-tests' into maint

diff --git a/git-send-email.perl b/git-send-email.perl
index 068d60b3e698f03f433db33d9e5f085ea57ce0a3..eea0a517f71b66f861db38f70fac0593f8c8cea4 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1563,7 +1563,7 @@ sub send_message {
        # Now parse the message body
        while(<$fh>) {
                $message .=  $_;
-               if (/^(Signed-off-by|Cc): (.*)$/i) {
+               if (/^(Signed-off-by|Cc): ([^>]*>?)/i) {
                        chomp;
                        my ($what, $c) = ($1, $2);
                        chomp $c;