diff options
| -rw-r--r-- | fsmonitor.c | 2 | ||||
| -rw-r--r-- | hashmap.h | 2 | ||||
| -rwxr-xr-x | t/t5510-fetch.sh | 2 | ||||
| -rwxr-xr-x | t/t6046-merge-skip-unneeded-updates.sh | 2 | ||||
| -rwxr-xr-x | t/t8014-blame-ignore-fuzzy.sh | 2 | ||||
| -rw-r--r-- | wt-status.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/fsmonitor.c b/fsmonitor.c index 932bd9012d..ed796e3e03 100644 --- 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); @@ -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 index a66dbe0bde..7456c567cd 100755 --- 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 index 1ddc9e6626..5a2d07e516 100755 --- 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 index 6e61882b6f..e68e6115a6 100755 --- 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 index c560cbe860..20f2075868 100644 --- 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. * |