From 3fca954172274668e79df188924865265ed29d03 Mon Sep 17 00:00:00 2001 From: Andrei Rybak Date: Fri, 25 Jun 2021 21:38:49 +0200 Subject: blame: correct name of config option in docs As can be seen in files "Documentation/blame-options.txt" and "builtin/blame.c", the name of this configuration option is "blame.markUnblamableLines". Signed-off-by: Andrei Rybak Reviewed-by: Bagas Sanjaya Signed-off-by: Junio C Hamano diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt index 9468e85..4d047c1 100644 --- 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]. -- cgit v0.10.2-6-g49f6 From 6fc53692636c75748975a84a6d7f3d83daf8a50a Mon Sep 17 00:00:00 2001 From: Andrei Rybak Date: Fri, 25 Jun 2021 21:38:50 +0200 Subject: t: fix typos in test messages Both in t4258 and in t9001, the code of the tests following shows the proper name for the configuration variables. So use the correct names in the test messages as well. Signed-off-by: Andrei Rybak Signed-off-by: Junio C Hamano diff --git a/t/t4258-am-quoted-cr.sh b/t/t4258-am-quoted-cr.sh index fb5071f..201915b 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 3b75400..09360ca 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" && -- cgit v0.10.2-6-g49f6 From 98c7656a18b032b92180c945484a51a15502821d Mon Sep 17 00:00:00 2001 From: Andrei Rybak Date: Fri, 25 Jun 2021 21:38:51 +0200 Subject: git-worktree.txt: fix typo in example path Signed-off-by: Andrei Rybak Signed-off-by: Junio C Hamano diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index f1bb1fa..66e67e6 100644 --- 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 ------------ -- cgit v0.10.2-6-g49f6