Typo fixes
cover Typo fixes
Fix some simple typos: doubled words, and character swapping
Elijah Newren (2):
Remove doubled words in various comments
hashmap: fix typo in usage docs
fsmonitor.c | 2 +- hashmap.h | 2 +- t/t5510-fetch.sh | 2 +- t/t6046-merge-skip-unneeded-updates.sh | 2 +- t/t8014-blame-ignore-fuzzy.sh | 2 +- wt-status.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
base-commit: 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-824%2Fnewren%2Ftypo-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-824/newren/typo-fixes-v1
Pull-Request: https://github.com/git/git/pull/824
Signature · 1 line
gitgitgadget
PATCH 1/2 Remove doubled words in various comments
From: Elijah Newren <[email protected]>
--- fsmonitor.c | 2 +- t/t5510-fetch.sh | 2 +- t/t6046-merge-skip-unneeded-updates.sh | 2 +- t/t8014-blame-ignore-fuzzy.sh | 2 +- wt-status.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
fsmonitor.c +1 -1
@@ -217,7 +217,7 @@ void refresh_fsmonitor(struct index_state *istate)* Need to use a char * variable because static * analysis was suggesting to use strbuf_addbuf * but we don't want to copy the entire strbuf -* only the the chars up to the first NUL +* only the chars up to the first NUL */ buf = query_result.buf;strbuf_addstr (&last_update_token, buf);
t/t5510-fetch.sh +1 -1
@@ -797,7 +797,7 @@ test_configured_prune true true unset unset pruned pruned \ "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" # --prune-tags on its own does nothing, needs --prune as well, same -# for for fetch.pruneTags without fetch.prune +# for fetch.pruneTags without fetch.prune test_configured_prune unset unset unset unset kept kept "--prune-tags" test_configured_prune unset unset true unset kept kept "" test_configured_prune unset unset unset true kept kept ""
t/t6046-merge-skip-unneeded-updates.sh +1 -1
@@ -661,7 +661,7 @@ test_setup_4a () { } # NOTE: For as long as we continue using unpack_trees() without index_only -# set to true, it will error out on a case like this claiming the the locally +# set to true, it will error out on a case like this claiming that the locally # modified file would be overwritten by the merge. Getting this testcase # correct requires doing the merge in-memory first, then realizing that no # updates to the file are necessary, and thus that we can just leave the path
t/t8014-blame-ignore-fuzzy.sh +1 -1
@@ -248,7 +248,7 @@ Final EOF # The first line of b matches best with the last line of a, but the overall -# match is better if we match it with the the first line of a. +# match is better if we match it with the first line of a. title11="Piggy in the middle" cat <<EOF >a11 abcdefg
wt-status.c +1 -1
@@ -2035,7 +2035,7 @@ static void wt_porcelain_print(struct wt_status *s)* [# branch.upstream <upstream><eol> * [# branch.ab +<ahead> -<behind><eol>]] * -* <commit> ::= the current commit hash or the the literal +* <commit> ::= the current commit hash or the literal * "(initial)" to indicate an initialized repo * with no commits. *
Signature · 1 line
gitgitgadget
PATCH 2/2 hashmap: fix typo in usage docs
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
--- hashmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hashmap.h +1 -1
@@ -168,7 +168,7 @@ struct hashmap_entry {* argument `keydata`, respectively. Otherwise, `keydata` is NULL. * * When it is too expensive to allocate a user entry (either because it is -* large or varialbe sized, such that it is not on the stack), then the +* large or variable sized, such that it is not on the stack), then the * relevant data to check for equality should be passed via `keydata`. * In this case `key` can be a stripped down version of the user key data * or even just a hashmap_entry having the correct hash.
Signature · 1 line
gitgitgadget
Quoted 1 line · Elijah Newren via GitGitGadget
Fix some simple typos: doubled words, and character swapping
Far be it from me--since I seem to always be making these mistakes myself--to be an authoritative reviewer on this series, but it looks obviously good to me ;-).
Quoted 13 lines
Elijah Newren (2):
Remove doubled words in various comments
hashmap: fix typo in usage docsfsmonitor.c | 2 +- hashmap.h | 2 +- t/t5510-fetch.sh | 2 +- t/t6046-merge-skip-unneeded-updates.sh | 2 +- t/t8014-blame-ignore-fuzzy.sh | 2 +- wt-status.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
Quoted 6 lines
base-commit:
47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-824%2Fnewren%2Ftypo-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-824/newren/typo-fixes-v1
Pull-Request: https://github.com/git/git/pull/824
--
gitgitgadget
Thanks,
Taylor
Quoted 6 lines · Taylor Blau
Quoted 1 line · Elijah Newren via GitGitGadget
Fix some simple typos: doubled words, and character swapping
Far be it from me--since I seem to always be making these mistakes myself--to be an authoritative reviewer on this series, but it looks obviously good to me ;-).
Yeah, I am guilty of making many of these, but the fixes all looked good.
Thanks.