Merge branch 'en/typofixes' into master

gitster · gitster · commit 5d4e13f6dfa2 · 2020-07-30T21:34:30.000-07:00
* en/typofixes:
  hashmap: fix typo in usage docs
  Remove doubled words in various comments
diff --git a/fsmonitor.c b/fsmonitor.c
@@ -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);
diff --git a/hashmap.h b/hashmap.h
@@ -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.
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
@@ -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     ""
diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh
@@ -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
diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
@@ -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
diff --git a/wt-status.c b/wt-status.c
@@ -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.
  *

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ struct hashmap_entry {`
`168`	`168`	* argument `keydata`, respectively. Otherwise, `keydata` is NULL.
`169`	`169`	`*`
`170`	`170`	`* 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`
`172`	`172`	* relevant data to check for equality should be passed via `keydata`.
`173`	`173`	* In this case `key` can be a stripped down version of the user key data
`174`	`174`	`* or even just a hashmap_entry having the correct hash.`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ test_setup_4a () {`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`# 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`
`665`	`665`	`# modified file would be overwritten by the merge. Getting this testcase`
`666`	`666`	`# correct requires doing the merge in-memory first, then realizing that no`
`667`	`667`	`# updates to the file are necessary, and thus that we can just leave the path`
Original file line number	Diff line number	Diff line change
`@@ -2035,7 +2035,7 @@ static void wt_porcelain_print(struct wt_status *s)`
`2035`	`2035`	`* [# branch.upstream <upstream><eol>`
`2036`	`2036`	`* [# branch.ab +<ahead> -<behind><eol>]]`
`2037`	`2037`	`*`
`2038`		`- * <commit> ::= the current commit hash or the the literal`
	`2038`	`+ * <commit> ::= the current commit hash or the literal`
`2039`	`2039`	`* "(initial)" to indicate an initialized repo`
`2040`	`2040`	`* with no commits.`
`2041`	`2041`	`*`