Browse Source

Remove doubled words in various comments

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 5 years ago committed by Junio C Hamano
parent
commit
6d12b533b7
  1. 2
      fsmonitor.c
  2. 2
      t/t5510-fetch.sh
  3. 2
      t/t6046-merge-skip-unneeded-updates.sh
  4. 2
      t/t8014-blame-ignore-fuzzy.sh
  5. 2
      wt-status.c

2
fsmonitor.c

@ -217,7 +217,7 @@ void refresh_fsmonitor(struct index_state *istate) @@ -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);

2
t/t5510-fetch.sh

@ -797,7 +797,7 @@ test_configured_prune true true unset unset pruned pruned \ @@ -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 ""

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

@ -661,7 +661,7 @@ test_setup_4a () { @@ -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

2
t/t8014-blame-ignore-fuzzy.sh

@ -248,7 +248,7 @@ Final @@ -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

2
wt-status.c

@ -2035,7 +2035,7 @@ static void wt_porcelain_print(struct wt_status *s) @@ -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.
*

Loading…
Cancel
Save