mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-07 01:06:09 +02:00
Code

Merge branch 'ab/send-email-config-fix' 

Regression fix.

* ab/send-email-config-fix:
  send-email: fix a "first config key wins" regression in v2.33.0
This commit is contained in:
Junio C Hamano 2021-09-15 13:15:24 -07:00
parent e8332242b7 b996f84989
commit 10de757a09
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-send-email.perl
View File

@ -376,7 +376,7 @@ sub read_config {
@$target = @values;
}
else {
my $v = $known_keys->{$key}->[0];
my $v = $known_keys->{$key}->[-1];
next unless defined $v;
next if $configured->{$setting}++;
$$target = $v;

15
t/t9001-send-email.sh
View File

@ -1533,6 +1533,21 @@ test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
test_cmp content-type-decl actual
'
test_expect_success $PREREQ 'sendemail.8bitEncoding in .git/config overrides --global .gitconfig' '
clean_fake_sendmail &&
git config sendemail.assume8bitEncoding UTF-8 &&
test_when_finished "rm -rf home" &&
mkdir home &&
git config -f home/.gitconfig sendemail.assume8bitEncoding "bogus too" &&
echo bogus |
env HOME="$(pwd)/home" DEBUG=1 \
git send-email --from=author@example.com --to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit >stdout &&
egrep "Content|MIME" msgtxt1 >actual &&
test_cmp content-type-decl actual
'
test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
clean_fake_sendmail &&
git config sendemail.assume8bitEncoding "bogus too" &&