Skip to content

Commit 0411c2d

Browse files
xyprongitster
authored andcommitted
send-email: honor transferencoding config option again
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e67a228 commit 0411c2d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

git-send-email.perl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ sub do_edit {
231231
my (@suppress_cc);
232232
my ($auto_8bit_encoding);
233233
my ($compose_encoding);
234-
my $target_xfer_encoding = 'auto';
234+
my ($target_xfer_encoding);
235235

236236
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
237237

@@ -434,6 +434,8 @@ sub read_config {
434434
$smtp_encryption = 'ssl';
435435
}
436436
}
437+
438+
$target_xfer_encoding = 'auto' unless (defined $target_xfer_encoding);
437439
}
438440

439441
# read configuration from [sendemail "$identity"], fall back on [sendemail]

0 commit comments

Comments
 (0)