Merge branch 'en/typofixes' into master

* en/typofixes:
  hashmap: fix typo in usage docs
  Remove doubled words in various comments
This commit is contained in:
Junio C Hamano 2020-07-30 21:34:30 -07:00
commit 5d4e13f6df
6 changed files with 6 additions and 6 deletions

View File

@ -217,7 +217,7 @@ void refresh_fsmonitor(struct index_state *istate)
* Need to use a char * variable because static * Need to use a char * variable because static
* analysis was suggesting to use strbuf_addbuf * analysis was suggesting to use strbuf_addbuf
* but we don't want to copy the entire strbuf * 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; buf = query_result.buf;
strbuf_addstr(&last_update_token, buf); strbuf_addstr(&last_update_token, buf);

View File

@ -168,7 +168,7 @@ struct hashmap_entry {
* argument `keydata`, respectively. Otherwise, `keydata` is NULL. * argument `keydata`, respectively. Otherwise, `keydata` is NULL.
* *
* When it is too expensive to allocate a user entry (either because it is * 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`. * 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 * 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. * or even just a hashmap_entry having the correct hash.

View File

@ -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 origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
# --prune-tags on its own does nothing, needs --prune as well, same # --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 unset unset kept kept "--prune-tags"
test_configured_prune unset unset true unset kept kept "" test_configured_prune unset unset true unset kept kept ""
test_configured_prune unset unset unset true kept kept "" test_configured_prune unset unset unset true kept kept ""

View File

@ -661,7 +661,7 @@ test_setup_4a () {
} }
# NOTE: For as long as we continue using unpack_trees() without index_only # 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 # modified file would be overwritten by the merge. Getting this testcase
# correct requires doing the merge in-memory first, then realizing that no # 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 # updates to the file are necessary, and thus that we can just leave the path

View File

@ -248,7 +248,7 @@ Final
EOF EOF
# The first line of b matches best with the last line of a, but the overall # 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" title11="Piggy in the middle"
cat <<EOF >a11 cat <<EOF >a11
abcdefg abcdefg

View File

@ -2035,7 +2035,7 @@ static void wt_porcelain_print(struct wt_status *s)
* [# branch.upstream <upstream><eol> * [# branch.upstream <upstream><eol>
* [# branch.ab +<ahead> -<behind><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 * "(initial)" to indicate an initialized repo
* with no commits. * with no commits.
* *