Skip to content

Commit 5d4e13f

Browse files
committed
Merge branch 'en/typofixes' into master
* en/typofixes: hashmap: fix typo in usage docs Remove doubled words in various comments
2 parents add0a35 + 861c4ce commit 5d4e13f

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

fsmonitor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void refresh_fsmonitor(struct index_state *istate)
217217
* Need to use a char * variable because static
218218
* analysis was suggesting to use strbuf_addbuf
219219
* but we don't want to copy the entire strbuf
220-
* only the the chars up to the first NUL
220+
* only the chars up to the first NUL
221221
*/
222222
buf = query_result.buf;
223223
strbuf_addstr(&last_update_token, buf);

hashmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ struct hashmap_entry {
168168
* argument `keydata`, respectively. Otherwise, `keydata` is NULL.
169169
*
170170
* When it is too expensive to allocate a user entry (either because it is
171-
* large or varialbe sized, such that it is not on the stack), then the
171+
* large or variable sized, such that it is not on the stack), then the
172172
* relevant data to check for equality should be passed via `keydata`.
173173
* In this case `key` can be a stripped down version of the user key data
174174
* or even just a hashmap_entry having the correct hash.

t/t5510-fetch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ test_configured_prune true true unset unset pruned pruned \
797797
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
798798

799799
# --prune-tags on its own does nothing, needs --prune as well, same
800-
# for for fetch.pruneTags without fetch.prune
800+
# for fetch.pruneTags without fetch.prune
801801
test_configured_prune unset unset unset unset kept kept "--prune-tags"
802802
test_configured_prune unset unset true unset kept kept ""
803803
test_configured_prune unset unset unset true kept kept ""

t/t6046-merge-skip-unneeded-updates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ test_setup_4a () {
661661
}
662662

663663
# NOTE: For as long as we continue using unpack_trees() without index_only
664-
# set to true, it will error out on a case like this claiming the the locally
664+
# set to true, it will error out on a case like this claiming that the locally
665665
# modified file would be overwritten by the merge. Getting this testcase
666666
# correct requires doing the merge in-memory first, then realizing that no
667667
# updates to the file are necessary, and thus that we can just leave the path

t/t8014-blame-ignore-fuzzy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ Final
248248
EOF
249249

250250
# The first line of b matches best with the last line of a, but the overall
251-
# match is better if we match it with the the first line of a.
251+
# match is better if we match it with the first line of a.
252252
title11="Piggy in the middle"
253253
cat <<EOF >a11
254254
abcdefg

wt-status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@ static void wt_porcelain_print(struct wt_status *s)
20352035
* [# branch.upstream <upstream><eol>
20362036
* [# branch.ab +<ahead> -<behind><eol>]]
20372037
*
2038-
* <commit> ::= the current commit hash or the the literal
2038+
* <commit> ::= the current commit hash or the literal
20392039
* "(initial)" to indicate an initialized repo
20402040
* with no commits.
20412041
*

0 commit comments

Comments
 (0)