summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:02 -0700
commit018b85dead99d968b8e66e0ee6b74358a74015d6 (patch)
tree9cbf8ff2082c68e3177f6b67984cae8136799a83 /t
parentMerge branch 'fw/complete-cmd-idx-fix' (diff)
parentgit-worktree.txt: fix typo in example path (diff)
downloadtgif-018b85dead99d968b8e66e0ee6b74358a74015d6.tar.xz
Merge branch 'ar/more-typofix'
Typofixes. * ar/more-typofix: git-worktree.txt: fix typo in example path t: fix typos in test messages blame: correct name of config option in docs
Diffstat (limited to 't')
-rwxr-xr-xt/t4258-am-quoted-cr.sh2
-rwxr-xr-xt/t9001-send-email.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t4258-am-quoted-cr.sh b/t/t4258-am-quoted-cr.sh
index fb5071f914..201915b45a 100755
--- a/t/t4258-am-quoted-cr.sh
+++ b/t/t4258-am-quoted-cr.sh
@@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' '
git diff --exit-code HEAD two
'
-test_expect_success 'am with config mailinfo.quotecr=strip' '
+test_expect_success 'am with config mailinfo.quotedCr=strip' '
test_might_fail git am --abort &&
git reset --hard one &&
test_config mailinfo.quotedCr strip &&
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 30eff725a9..e9dc58f508 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1829,7 +1829,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
grep "^!somebody@example\.org!$" commandline1
'
-test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
+test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' '
clean_fake_sendmail &&
echo "alias sbd someone@example.org" >"$HOME/.mailrc" &&
git config --replace-all sendemail.aliasesfile "~/.mailrc" &&