send-email: honor transferencoding config option again

xypron · gitster · commit 0411c2d070b5 · 2019-04-10T12:23:27.000+09:00
Since e67a228 ("send-email: automatically determine transfer-encoding"), the value of sendmail.transferencoding in the configuration file is ignored, because $target_xfer_encoding is already defined read_config sub parses the configuration file. Instead of initializing variable $target_xfer_encoding to 'auto' on definition, we have to set it to the default value of 'auto' if is undefined after parsing the configuration files. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -231,7 +231,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()
 
@@ -434,6 +434,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
`@@ -231,7 +231,7 @@ sub do_edit {`
`231`	`231`	`my (@suppress_cc);`
`232`	`232`	`my ($auto_8bit_encoding);`
`233`	`233`	`my ($compose_encoding);`
`234`		`-my $target_xfer_encoding = 'auto';`
	`234`	`+my ($target_xfer_encoding);`
`235`	`235`
`236`	`236`	`my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()`
`237`	`237`
`@@ -434,6 +434,8 @@ sub read_config {`
`434`	`434`	`$smtp_encryption = 'ssl';`
`435`	`435`	`}`
`436`	`436`	`}`
	`437`	`+`
	`438`	`+ $target_xfer_encoding = 'auto' unless (defined $target_xfer_encoding);`
`437`	`439`	`}`
`438`	`440`
`439`	`441`	`# read configuration from [sendemail "$identity"], fall back on [sendemail]`