Merge branch 'hs/send-email-transferencoding-fix' into pu

gitster · gitster · commit 60b1b89047e0 · 2019-04-25T17:52:01.000+09:00
Since "git send-email" learned to take 'auto' as the value for the
transfer-encoding, it by mistake stopped honoring the values given
to the configuration variables sendemail.transferencoding and/or
sendemail.&lt;ident&gt;.transferencoding.  Attempt to correct this.

Not quite.
cf. &lt;xmqq8swi34h5.fsf@gitster-ct.c.googlers.com&gt;

* hs/send-email-transferencoding-fix:
  send-email: honor transferencoding config option again
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -239,7 +239,7 @@ sub do_edit {
 my (@suppress_cc);
 my ($auto_8bit_encoding);
 my ($compose_encoding);
-my $target_xfer_encoding = 'auto';
+my ($target_xfer_encoding);
 
 my ($debug_net_smtp) = 0;		# Net::SMTP, see send_message()
 
@@ -446,6 +446,8 @@ sub read_config {
 			$smtp_encryption = 'ssl';
 		}
 	}
+
+	$target_xfer_encoding = 'auto' unless (defined $target_xfer_encoding);
 }
 
 # read configuration from [sendemail "$identity"], fall back on [sendemail]

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ sub do_edit {`
`239`	`239`	`my (@suppress_cc);`
`240`	`240`	`my ($auto_8bit_encoding);`
`241`	`241`	`my ($compose_encoding);`
`242`		`-my $target_xfer_encoding = 'auto';`
	`242`	`+my ($target_xfer_encoding);`
`243`	`243`
`244`	`244`	`my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()`
`245`	`245`
`@@ -446,6 +446,8 @@ sub read_config {`
`446`	`446`	`$smtp_encryption = 'ssl';`
`447`	`447`	`}`
`448`	`448`	`}`
	`449`	`+`
	`450`	`+ $target_xfer_encoding = 'auto' unless (defined $target_xfer_encoding);`
`449`	`451`	`}`
`450`	`452`
`451`	`453`	`# read configuration from [sendemail "$identity"], fall back on [sendemail]`