Merge branch 'ar/more-typofix'

gitster · gitster · commit 018b85dead99 · 2021-07-08T13:15:02.000-07:00
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
diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt
@@ -27,7 +27,7 @@ blame.ignoreRevsFile::
 	file names will reset the list of ignored revisions.  This option will
 	be handled before the command line option `--ignore-revs-file`.
 
-blame.markUnblamables::
+blame.markUnblamableLines::
 	Mark lines that were changed by an ignored revision that we could not
 	attribute to another commit with a '*' in the output of
 	linkgit:git-blame[1].
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
@@ -387,7 +387,7 @@ These annotations are:
 ------------
 $ git worktree list
 /path/to/linked-worktree    abcd1234 [master]
-/path/to/locked-worktreee   acbd5678 (brancha) locked
+/path/to/locked-worktree    acbd5678 (brancha) locked
 /path/to/prunable-worktree  5678abc  (detached HEAD) prunable
 ------------
 
diff --git 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
@@ -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" &&

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' '`
`26`	`26`	`git diff --exit-code HEAD two`
`27`	`27`	`'`
`28`	`28`
`29`		`-test_expect_success 'am with config mailinfo.quotecr=strip' '`
	`29`	`+test_expect_success 'am with config mailinfo.quotedCr=strip' '`
`30`	`30`	`test_might_fail git am --abort &&`
`31`	`31`	`git reset --hard one &&`
`32`	`32`	`test_config mailinfo.quotedCr strip &&`
Original file line number	Diff line number	Diff line change
`@@ -1829,7 +1829,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '`
`1829`	`1829`	`grep "^!somebody@example\.org!$" commandline1`
`1830`	`1830`	`'`
`1831`	`1831`
`1832`		`-test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '`
	`1832`	`+test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' '`
`1833`	`1833`	`clean_fake_sendmail &&`
`1834`	`1834`	`echo "alias sbd someone@example.org" >"$HOME/.mailrc" &&`
`1835`	`1835`	`git config --replace-all sendemail.aliasesfile "~/.mailrc" &&`