diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-30 21:34:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 21:34:30 -0700 |
| commit | 5d4e13f6dfa28d31513dc286a52e33e672eea70a (patch) | |
| tree | d6a7ddbac5fb4e3b0c030c8c1435a71916e01c18 /t | |
| parent | Merge branch 'rs/grep-simpler-parse-object-or-die-call' into master (diff) | |
| parent | hashmap: fix typo in usage docs (diff) | |
| download | tgif-5d4e13f6dfa28d31513dc286a52e33e672eea70a.tar.xz | |
Merge branch 'en/typofixes' into master
* en/typofixes:
hashmap: fix typo in usage docs
Remove doubled words in various comments
Diffstat (limited to 't')
| -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 |
3 files changed, 3 insertions, 3 deletions
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 |