From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jun 2010 23:19:03 +0000 (-0700)
Subject: Merge branch 'tr/send-email-8bit' into maint
X-Git-Tag: v1.7.1.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54fcb21b899eefc299c4ad94d2f2e229c72d3be5;p=git.git

Merge branch 'tr/send-email-8bit' into maint

* tr/send-email-8bit:
  send-email: ask about and declare 8bit mails
---

54fcb21b899eefc299c4ad94d2f2e229c72d3be5
diff --cc git-send-email.perl
index 111c98122,0db39b0de..6dab3bf6a
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -188,9 -191,10 +189,10 @@@ sub do_edit 
  # Variables with corresponding config settings
  my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
  my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
 -my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts);
 +my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
  my ($validate, $confirm);
  my (@suppress_cc);
+ my ($auto_8bit_encoding);
  
  my ($debug_net_smtp) = 0;		# Net::SMTP, see send_message()