aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-03-12 10:56:05 -0700
committerJunio C Hamano <gitster@pobox.com>2026-03-12 10:56:05 -0700
commit99da9348352a4e79246c17fd6cef425af801e309 (patch)
treef764ce347449d69cf6aa6971295d10b04eded16e /t
parent898549142353fa105ad2c466a52e497620d12bb3 (diff)
parentc52f085a477c8eece87821c5bbc035e5a900eb12 (diff)
downloadgit-99da9348352a4e79246c17fd6cef425af801e309.tar.xz
Merge branch 'sp/send-email-validate-charset'
"git send-email" has learned to be a bit more careful when it accepts charset to use from the end-user, to avoid 'y' (mistaken 'yes' when expecting a charset like 'UTF-8') and other nonsense. * sp/send-email-validate-charset: send-email: validate charset name in 8bit encoding prompt
Diffstat (limited to 't')
-rwxr-xr-xt/t9001-send-email.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index e56e0c8d77..24f6c76aee 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1691,7 +1691,7 @@ test_expect_success $PREREQ 'asks about and fixes 8bit encodings' '
email-using-8bit >stdout &&
grep "do not declare a Content-Transfer-Encoding" stdout &&
grep email-using-8bit stdout &&
- grep "Which 8bit encoding" stdout &&
+ grep "Declare which 8bit encoding to use" stdout &&
grep -E "Content|MIME" msgtxt1 >actual &&
test_cmp content-type-decl actual
'