X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-send-email.perl;h=24859a7bc37b05909cf16554c102cadc842c13ff;hb=e59150199c063726d6613bf7b86d4c4dd8dfc1e6;hp=8200d58cdc62b628f77923305ecb79ff260155ea;hpb=5c2b4ca06ee2803bd5329cb0ccfc12cfaa40afe7;p=thirdparty%2Fgit.git

diff --git a/git-send-email.perl b/git-send-email.perl
index 8200d58cdc..24859a7bc3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1699,7 +1699,7 @@ sub process_file {
 	# Now parse the message body
 	while(<$fh>) {
 		$message .=  $_;
-		if (/^([a-z-]*-by|Cc): (.*)/i) {
+		if (/^([a-z][a-z-]*-by|Cc): (.*)/i) {
 			chomp;
 			my ($what, $c) = ($1, $2);
 			# strip garbage for the address we'll use:
@@ -1872,7 +1872,7 @@ sub apply_transfer_encoding {
 	$message = MIME::Base64::decode($message)
 		if ($from eq 'base64');
 
-	$to = ($message =~ /.{999,}/) ? 'quoted-printable' : '8bit'
+	$to = ($message =~ /(?:.{999,}|\r)/) ? 'quoted-printable' : '8bit'
 		if $to eq 'auto';
 
 	die __("cannot send message as 7bit")