{"thread":{"id":"62398","subject":"[PATCH] t: fix typos","startedAt":"2024-10-23T17:01:24Z","lastAt":"2024-10-25T09:20:19Z","messageCount":8,"participants":["Andrew Kreimer","Kristoffer Haugsbakk","Taylor Blau"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"505951","messageId":"20241023170111.6638-1-algonell@gmail.com","threadId":"62398","inReplyTo":null,"subject":"[PATCH] t: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-23T17:01:11Z","receivedAt":"2024-10-23T17:01:24Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos in documentation, comments, etc.\n\nVia codespell.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n t/t3431-rebase-fork-point.sh              |  2 +-\n t/t3504-cherry-pick-rerere.sh             |  2 +-\n t/t3920-crlf-messages.sh                  |  2 +-\n t/t5303-pack-corruption-resilience.sh     |  2 +-\n t/t5324-split-commit-graph.sh             |  2 +-\n t/t5329-pack-objects-cruft.sh             |  2 +-\n t/t5411/test-0034-report-ft.sh            |  2 +-\n t/t5411/test-0035-report-ft--porcelain.sh |  2 +-\n t/t5500-fetch-pack.sh                     |  2 +-\n t/t5528-push-default.sh                   |  2 +-\n t/t5531-deep-submodule-push.sh            |  2 +-\n t/t5558-clone-bundle-uri.sh               |  4 ++--\n t/t6200-fmt-merge-msg.sh                  | 16 ++++++++--------\n t/t6300-for-each-ref.sh                   |  2 +-\n t/t6302-for-each-ref-filter.sh            |  6 +++---\n t/t6404-recursive-merge.sh                |  2 +-\n t/t6439-merge-co-error-msgs.sh            |  2 +-\n t/t7031-verify-tag-signed-ssh.sh          |  2 +-\n t/t7064-wtstatus-pv2.sh                   |  2 +-\n t/t7413-submodule-is-active.sh            |  2 +-\n t/t7513-interpret-trailers.sh             |  4 ++--\n t/t7527-builtin-fsmonitor.sh              |  2 +-\n t/t7601-merge-pull-config.sh              |  2 +-\n t/t7702-repack-cyclic-alternate.sh        |  2 +-\n t/t8009-blame-vs-topicbranches.sh         |  2 +-\n t/t9003-help-autocorrect.sh               |  2 +-\n 26 files changed, 37 insertions(+), 37 deletions(-)\n\ndiff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh\nindex 0bb284d61d..7b9c135c6e 100755\n--- a/t/t3431-rebase-fork-point.sh\n+++ b/t/t3431-rebase-fork-point.sh\n@@ -74,7 +74,7 @@ test_rebase 'G F C D B A' --onto D main\n test_rebase 'G F C B A' --keep-base refs/heads/main\n test_rebase 'G F C B A' --keep-base main\n \n-test_expect_success 'git rebase --fork-point with ambigous refname' '\n+test_expect_success 'git rebase --fork-point with ambiguous refname' '\n \tgit checkout main &&\n \tgit checkout -b one &&\n \tgit checkout side &&\ndiff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh\nindex 597c98e9c5..109016eba9 100755\n--- a/t/t3504-cherry-pick-rerere.sh\n+++ b/t/t3504-cherry-pick-rerere.sh\n@@ -43,7 +43,7 @@ test_expect_success 'cherry-pick conflict with --rerere-autoupdate' '\n \tgit reset --hard bar-dev\n '\n \n-test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' '\n+test_expect_success 'cherry-pick conflict respects rerere.autoUpdate' '\n \ttest_config rerere.autoUpdate true &&\n \ttest_must_fail git cherry-pick foo..bar-main &&\n \ttest_cmp foo-expect foo &&\ndiff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh\nindex 50ae222f08..31877f00c7 100755\n--- a/t/t3920-crlf-messages.sh\n+++ b/t/t3920-crlf-messages.sh\n@@ -82,7 +82,7 @@ test_crlf_subject_body_and_contents() {\n \n \n test_expect_success 'Setup refs with commit and tag messages using CRLF' '\n-\ttest_commit inital &&\n+\ttest_commit initial &&\n \tcreate_crlf_refs\n '\n \ndiff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh\nindex e6a43ec9ae..b634bfb665 100755\n--- a/t/t5303-pack-corruption-resilience.sh\n+++ b/t/t5303-pack-corruption-resilience.sh\n@@ -15,7 +15,7 @@ TEST_PASSES_SANITIZE_LEAK=true\n # 1) blob_2 is a delta with blob_1 for base and blob_3 is a delta with blob2\n #    for base, such that blob_3 delta depth is 2;\n #\n-# 2) the bulk of object data is uncompressible so the text part remains\n+# 2) the bulk of object data is incompressible so the text part remains\n #    visible;\n #\n # 3) object header is always 2 bytes.\ndiff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh\nindex 77e91547ea..1193726daa 100755\n--- a/t/t5324-split-commit-graph.sh\n+++ b/t/t5324-split-commit-graph.sh\n@@ -203,7 +203,7 @@ then\n \tgraph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 \"fork\"\n fi\n \n-test_expect_success 'test merge stragety constants' '\n+test_expect_success 'test merge strategy constants' '\n \tgit clone . merge-2 &&\n \t(\n \t\tcd merge-2 &&\ndiff --git a/t/t5329-pack-objects-cruft.sh b/t/t5329-pack-objects-cruft.sh\nindex 445739d06c..54a4a49997 100755\n--- a/t/t5329-pack-objects-cruft.sh\n+++ b/t/t5329-pack-objects-cruft.sh\n@@ -690,7 +690,7 @@ test_expect_success 'cruft --local drops unreachable objects' '\n \ttest_when_finished \"rm -fr alternate repo\" &&\n \n \ttest_commit -C alternate base &&\n-\t# Pack all objects in alterate so that the cruft repack in \"repo\" sees\n+\t# Pack all objects in alternate so that the cruft repack in \"repo\" sees\n \t# the object it dropped due to `--local` as packed. Otherwise this\n \t# object would not appear packed anywhere (since it is not packed in\n \t# alternate and likewise not part of the cruft pack in the other repo\ndiff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh\nindex 0e37535065..78d0b63876 100644\n--- a/t/t5411/test-0034-report-ft.sh\n+++ b/t/t5411/test-0034-report-ft.sh\n@@ -10,7 +10,7 @@ test_expect_success \"setup proc-receive hook (ft, $PROTOCOL)\" '\n # Refs of upstream : main(A)\n # Refs of workbench: main(A)  tags/v123\n # git push         :                       refs/for/main/topic(B)\n-test_expect_success \"proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)\" '\n+test_expect_success \"proc-receive: fall through, let receive-pack to execute ($PROTOCOL)\" '\n \tgit -C workbench push origin \\\n \t\t$B:refs/for/main/topic \\\n \t\t>out 2>&1 &&\ndiff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh\nindex b9a05181f1..df5fc212be 100644\n--- a/t/t5411/test-0035-report-ft--porcelain.sh\n+++ b/t/t5411/test-0035-report-ft--porcelain.sh\n@@ -10,7 +10,7 @@ test_expect_success \"setup proc-receive hook (fall-through, $PROTOCOL/porcelain)\n # Refs of upstream : main(A)\n # Refs of workbench: main(A)  tags/v123\n # git push         :                       refs/for/main/topic(B)\n-test_expect_success \"proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)\" '\n+test_expect_success \"proc-receive: fall through, let receive-pack to execute ($PROTOCOL/porcelain)\" '\n \tgit -C workbench push --porcelain origin \\\n \t\t$B:refs/for/main/topic \\\n \t\t>out 2>&1 &&\ndiff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh\nindex 605f17240c..bd08187d1b 100755\n--- a/t/t5500-fetch-pack.sh\n+++ b/t/t5500-fetch-pack.sh\n@@ -418,7 +418,7 @@ test_expect_success 'in_vain not triggered before first ACK' '\n \ttest_grep \"remote: Total 3 \" log\n '\n \n-test_expect_success 'in_vain resetted upon ACK' '\n+test_expect_success 'in_vain reset upon ACK' '\n \ttest_when_finished rm -f log trace2 &&\n \trm -rf myserver myclient &&\n \tgit init myserver &&\ndiff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh\nindex bc2bada34c..aecd03d69f 100755\n--- a/t/t5528-push-default.sh\n+++ b/t/t5528-push-default.sh\n@@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails with upstream and simple ' '\n #  - the default push succeeds\n #\n # A previous test expected this to fail, but for the wrong reasons:\n-# it expected a fail becaause the branch is new and cannot be pushed, but\n+# it expected a fail because the branch is new and cannot be pushed, but\n # in fact it was failing because of an ambiguous remote\n #\n test_expect_failure 'push from/to new branch fails with matching ' '\ndiff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh\nindex 135823630a..dcfef67af4 100755\n--- a/t/t5531-deep-submodule-push.sh\n+++ b/t/t5531-deep-submodule-push.sh\n@@ -204,7 +204,7 @@ test_expect_success 'push recurse-submodules last one wins on command line' '\n \t\tcd work/gar/bage &&\n \t\t>recurse-check-on-command-line-overriding-earlier-command-line &&\n \t\tgit add recurse-check-on-command-line-overriding-earlier-command-line &&\n-\t\tgit commit -m \"Recurse on command-line overridiing earlier command-line junk\"\n+\t\tgit commit -m \"Recurse on command-line overriding earlier command-line junk\"\n \t) &&\n \t(\n \t\tcd work &&\ndiff --git a/t/t5558-clone-bundle-uri.sh b/t/t5558-clone-bundle-uri.sh\nindex cd05321e17..3816ed5058 100755\n--- a/t/t5558-clone-bundle-uri.sh\n+++ b/t/t5558-clone-bundle-uri.sh\n@@ -945,7 +945,7 @@ test_expect_success 'creationToken heuristic with failed downloads (clone)' '\n \t\t--bundle-uri=\"$HTTPD_URL/bundle-list\" \\\n \t\t\"$HTTPD_URL/smart/fetch.git\" download-3 &&\n \n-\t# As long as we have continguous successful downloads,\n+\t# As long as we have contiguous successful downloads,\n \t# we _do_ set these configs.\n \ttest_cmp_config -C download-3 \"$HTTPD_URL/bundle-list\" fetch.bundleuri &&\n \ttest_cmp_config -C download-3 3 fetch.bundlecreationtoken &&\n@@ -1189,7 +1189,7 @@ test_expect_success 'creationToken heuristic with failed downloads (fetch)' '\n \tGIT_TRACE2_EVENT=\"$(pwd)/trace-fetch-3.txt\" \\\n \t\tgit -C fetch-3 fetch origin &&\n \n-\t# As long as we have continguous successful downloads,\n+\t# As long as we have contiguous successful downloads,\n \t# we _do_ set the maximum creation token.\n \ttest_cmp_config -C fetch-3 6 fetch.bundlecreationtoken &&\n \ndiff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh\nindex ac57b0e4ae..0a4388f343 100755\n--- a/t/t6200-fmt-merge-msg.sh\n+++ b/t/t6200-fmt-merge-msg.sh\n@@ -608,34 +608,34 @@ test_expect_success 'merge-msg with \"merging\" an annotated tag' '\n \n \tgit checkout main^0 &&\n \tgit commit --allow-empty -m \"One step ahead\" &&\n-\tgit tag -a -m \"An annotated one\" annote HEAD &&\n+\tgit tag -a -m \"An annotated one\" annotate HEAD &&\n \n \tgit checkout main &&\n-\tgit fetch . annote &&\n+\tgit fetch . annotate &&\n \n \tgit fmt-merge-msg <.git/FETCH_HEAD >actual &&\n \t{\n \t\tcat <<-\\EOF\n-\t\tMerge tag '\\''annote'\\''\n+\t\tMerge tag '\\''annotate'\\''\n \n \t\tAn annotated one\n \n-\t\t* tag '\\''annote'\\'':\n+\t\t* tag '\\''annotate'\\'':\n \t\t  One step ahead\n \t\tEOF\n \t} >expected &&\n \ttest_cmp expected actual &&\n \n \ttest_when_finished \"git reset --hard\" &&\n-\tannote=$(git rev-parse annote) &&\n-\tgit merge --no-commit --no-ff $annote &&\n+\tannotate=$(git rev-parse annotate) &&\n+\tgit merge --no-commit --no-ff $annotate &&\n \t{\n \t\tcat <<-EOF\n-\t\tMerge tag '\\''$annote'\\''\n+\t\tMerge tag '\\''$annotate'\\''\n \n \t\tAn annotated one\n \n-\t\t* tag '\\''$annote'\\'':\n+\t\t* tag '\\''$annotate'\\'':\n \t\t  One step ahead\n \t\tEOF\n \t} >expected &&\ndiff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh\nindex b3163629c5..c39d4e7e9c 100755\n--- a/t/t6300-for-each-ref.sh\n+++ b/t/t6300-for-each-ref.sh\n@@ -770,7 +770,7 @@ test_expect_success 'describe:abbrev=... vs describe --abbrev=...' '\n \t\t\trefs/heads/master >actual &&\n \t\ttest_cmp expect actual &&\n \n-\t\t# Make sure the hash used is atleast 14 digits long\n+\t\t# Make sure the hash used is at least 14 digits long\n \t\tsed -e \"s/^.*-g\\([0-9a-f]*\\)$/\\1/\" <actual >hexpart &&\n \t\ttest 15 -le $(wc -c <hexpart) &&\n \ndiff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh\nindex 7f44d3c3f2..a3e1258a4c 100755\n--- a/t/t6302-for-each-ref-filter.sh\n+++ b/t/t6302-for-each-ref-filter.sh\n@@ -14,7 +14,7 @@ test_expect_success 'setup some history and refs' '\n \tgit checkout -b side &&\n \ttest_commit four &&\n \tgit tag -m \"An annotated tag\" annotated-tag &&\n-\tgit tag -m \"Annonated doubly\" doubly-annotated-tag annotated-tag &&\n+\tgit tag -m \"Annotated doubly\" doubly-annotated-tag annotated-tag &&\n \n \t# Note that these \"signed\" tags might not actually be signed.\n \t# Tests which care about the distinction should be marked\n@@ -343,7 +343,7 @@ test_expect_success 'check `%(contents:lines=1)`' '\n \tside |four\n \todd/spot |three\n \tannotated-tag |An annotated tag\n-\tdoubly-annotated-tag |Annonated doubly\n+\tdoubly-annotated-tag |Annotated doubly\n \tdoubly-signed-tag |Signed doubly\n \tfour |four\n \tone |one\n@@ -379,7 +379,7 @@ test_expect_success 'check `%(contents:lines=99999)`' '\n \tside |four\n \todd/spot |three\n \tannotated-tag |An annotated tag\n-\tdoubly-annotated-tag |Annonated doubly\n+\tdoubly-annotated-tag |Annotated doubly\n \tdoubly-signed-tag |Signed doubly\n \tfour |four\n \tone |one\ndiff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh\nindex 36215518b6..57169ca24b 100755\n--- a/t/t6404-recursive-merge.sh\n+++ b/t/t6404-recursive-merge.sh\n@@ -88,7 +88,7 @@ test_expect_success 'result contains a conflict' '\n '\n \n test_expect_success 'virtual trees were processed' '\n-\t# TODO: fragile test, relies on ambigious merge-base resolution\n+\t# TODO: fragile test, relies on ambiguous merge-base resolution\n \tgit ls-files --stage >out &&\n \n \tcat >expect <<-EOF &&\ndiff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh\nindex 0cbec57cda..a9804ae42f 100755\n--- a/t/t6439-merge-co-error-msgs.sh\n+++ b/t/t6439-merge-co-error-msgs.sh\n@@ -65,7 +65,7 @@ Please move or remove them before you merge.\n Aborting\n EOF\n \n-test_expect_success 'untracked files or local changes ovewritten by merge' '\n+test_expect_success 'untracked files or local changes overwritten by merge' '\n \tgit add two &&\n \tgit add three &&\n \tgit add four &&\ndiff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh\nindex 20913b3713..80359d48f7 100755\n--- a/t/t7031-verify-tag-signed-ssh.sh\n+++ b/t/t7031-verify-tag-signed-ssh.sh\n@@ -116,7 +116,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag succeeds with tag date\n \t! grep \"${GPGSSH_BAD_SIGNATURE}\" actual\n '\n \n-test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag failes with tag date outside of key validity' '\n+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag fails with tag date outside of key validity' '\n \ttest_config gpg.ssh.allowedSignersFile \"${GPGSSH_ALLOWED_SIGNERS}\" &&\n \ttest_must_fail git verify-tag timeboxedinvalid-signed 2>actual &&\n \t! grep \"${GPGSSH_GOOD_SIGNATURE_TRUSTED}\" actual\ndiff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh\nindex 06c1301222..2458e9d0eb 100755\n--- a/t/t7064-wtstatus-pv2.sh\n+++ b/t/t7064-wtstatus-pv2.sh\n@@ -77,7 +77,7 @@ test_expect_success 'before initial commit, things added (-z)' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'make first commit, comfirm HEAD oid and branch' '\n+test_expect_success 'make first commit, confirm HEAD oid and branch' '\n \tgit commit -m initial &&\n \tH0=$(git rev-parse HEAD) &&\n \tcat >expect <<-EOF &&\ndiff --git a/t/t7413-submodule-is-active.sh b/t/t7413-submodule-is-active.sh\nindex 887d181b72..b9c89b1019 100755\n--- a/t/t7413-submodule-is-active.sh\n+++ b/t/t7413-submodule-is-active.sh\n@@ -22,7 +22,7 @@ test_expect_success 'setup' '\n \tgit -C super submodule add ../sub sub2 &&\n \n \t# Remove submodule.<name>.active entries in order to test in an\n-\t# environment where only URLs are present in the conifg\n+\t# environment where only URLs are present in the config\n \tgit -C super config --unset submodule.sub1.active &&\n \tgit -C super config --unset submodule.sub2.active &&\n \ndiff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh\nindex 0f7d8938d9..818a8dafbd 100755\n--- a/t/t7513-interpret-trailers.sh\n+++ b/t/t7513-interpret-trailers.sh\n@@ -857,7 +857,7 @@ test_expect_success 'using \"--where after\" with \"--no-where\"' '\n # the hardcoded default (in WHERE_END) assuming the absence of .gitconfig).\n # Here, the \"start\" setting of trailer.where is respected, so the new \"Acked-by\"\n # and \"Bug\" trailers are placed at the beginning, and not at the end which is\n-# the harcoded default.\n+# the hardcoded default.\n test_expect_success 'using \"--where after\" with \"--no-where\" defaults to configuration' '\n \ttest_config trailer.ack.key \"Acked-by= \" &&\n \ttest_config trailer.bug.key \"Bug #\" &&\n@@ -881,7 +881,7 @@ test_expect_success 'using \"--where after\" with \"--no-where\" defaults to configu\n # immediately after it. For the next trailer (Bug #42), we default to using the\n # hardcoded WHERE_END because we don't have any \"trailer.where\" or\n # \"trailer.bug.where\" configured.\n-test_expect_success 'using \"--no-where\" defaults to harcoded default if nothing configured' '\n+test_expect_success 'using \"--no-where\" defaults to hardcoded default if nothing configured' '\n \ttest_config trailer.ack.key \"Acked-by= \" &&\n \ttest_config trailer.bug.key \"Bug #\" &&\n \ttest_config trailer.separators \":=#\" &&\ndiff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh\nindex 9b15baa02d..409cd0cd12 100755\n--- a/t/t7527-builtin-fsmonitor.sh\n+++ b/t/t7527-builtin-fsmonitor.sh\n@@ -765,7 +765,7 @@ done\n # by the FSMonitor response to skip those recursive calls.  That is,\n # even if FSMonitor says that the mtime of the submodule directory\n # hasn't changed and it could be implicitly marked valid, we must\n-# not take that shortcut.  We need to force the recusion into the\n+# not take that shortcut.  We need to force the recursion into the\n # submodule so that we get a summary of the status *within* the\n # submodule.\n \ndiff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh\nindex 7fd8c086af..c83298ba68 100755\n--- a/t/t7601-merge-pull-config.sh\n+++ b/t/t7601-merge-pull-config.sh\n@@ -281,7 +281,7 @@ test_expect_success '--rebase overrides pull.ff unset' '\n \ttest_does_rebase pull --rebase\n '\n \n-# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff\n+# Group 4: --no-rebase heeds pull.ff=!only or explicit --ff or --no-ff\n \n test_expect_success '--no-rebase works with --no-ff' '\n \ttest_does_merge_when_ff_possible pull --no-rebase --no-ff\ndiff --git a/t/t7702-repack-cyclic-alternate.sh b/t/t7702-repack-cyclic-alternate.sh\nindex f3cdb98eec..d151d4f603 100755\n--- a/t/t7702-repack-cyclic-alternate.sh\n+++ b/t/t7702-repack-cyclic-alternate.sh\n@@ -18,7 +18,7 @@ test_expect_success setup '\n \techo \"$(pwd)\"/.git/objects/../objects >.git/objects/info/alternates\n '\n \n-test_expect_success 're-packing repository with itsself as alternate' '\n+test_expect_success 're-packing repository with itself as alternate' '\n \tgit repack -adl &&\n \tgit fsck\n '\ndiff --git a/t/t8009-blame-vs-topicbranches.sh b/t/t8009-blame-vs-topicbranches.sh\nindex 30331713b9..cc51108464 100755\n--- a/t/t8009-blame-vs-topicbranches.sh\n+++ b/t/t8009-blame-vs-topicbranches.sh\n@@ -1,6 +1,6 @@\n #!/bin/sh\n \n-test_description='blaming trough history with topic branches'\n+test_description='blaming through history with topic branches'\n \n TEST_PASSES_SANITIZE_LEAK=true\n . ./test-lib.sh\ndiff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh\nindex 14a704d0a8..3be063afab 100755\n--- a/t/t9003-help-autocorrect.sh\n+++ b/t/t9003-help-autocorrect.sh\n@@ -65,7 +65,7 @@ test_expect_success 'autocorrect can be declined altogether' '\n test_expect_success 'autocorrect works in work tree created from bare repo' '\n \tgit clone --bare . bare.git &&\n \tgit -C bare.git worktree add ../worktree &&\n-\tgit -C worktree -c help.autocorrect=immediate stauts\n+\tgit -C worktree -c help.autocorrect=immediate status\n '\n \n test_done\n-- \n2.39.5\n\n"},{"id":"505959","messageId":"fa5d771b-5819-4ede-bc95-9d50c456c619@app.fastmail.com","threadId":"62398","inReplyTo":"20241023170111.6638-1-algonell@gmail.com","subject":"Re: [PATCH] t: fix typos","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2024-10-23T18:00:53Z","receivedAt":"2024-10-23T18:01:19Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"All of the changes here look good.\n\nOn Wed, Oct 23, 2024, at 19:01, Andrew Kreimer wrote:\n> Fix typos in documentation, comments, etc.\n>\n> Via codespell.\n>\n> Signed-off-by: Andrew Kreimer <algonell@gmail.com>\n> […]\n> diff --git a/t/t5303-pack-corruption-resilience.sh\n> b/t/t5303-pack-corruption-resilience.sh\n> index e6a43ec9ae..b634bfb665 100755\n> --- a/t/t5303-pack-corruption-resilience.sh\n> +++ b/t/t5303-pack-corruption-resilience.sh\n> @@ -15,7 +15,7 @@ TEST_PASSES_SANITIZE_LEAK=true\n>  # 1) blob_2 is a delta with blob_1 for base and blob_3 is a delta with\n> blob2\n>  #    for base, such that blob_3 delta depth is 2;\n>  #\n> -# 2) the bulk of object data is uncompressible so the text part remains\n> +# 2) the bulk of object data is incompressible so the text part remains\n\nUnusual word IME but makes sense here after googling:\nhttps://www.merriam-webster.com/dictionary/contiguous\n\n> […]\n> diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh\n> index bc2bada34c..aecd03d69f 100755\n> --- a/t/t5528-push-default.sh\n> +++ b/t/t5528-push-default.sh\n> @@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails\n> with upstream and simple ' '\n>  #  - the default push succeeds\n>  #\n>  # A previous test expected this to fail, but for the wrong reasons:\n> -# it expected a fail becaause the branch is new and cannot be pushed,\n> but\n> +# it expected a fail because the branch is new and cannot be pushed,\n\nAlso: s/a fail/a failure/ ?\n\nPerhaps “to fail”.\n\n> […]\n> diff --git a/t/t5558-clone-bundle-uri.sh b/t/t5558-clone-bundle-uri.sh\n> index cd05321e17..3816ed5058 100755\n> --- a/t/t5558-clone-bundle-uri.sh\n> +++ b/t/t5558-clone-bundle-uri.sh\n> @@ -945,7 +945,7 @@ test_expect_success 'creationToken heuristic with\n> failed downloads (clone)' '\n>  \t\t--bundle-uri=\"$HTTPD_URL/bundle-list\" \\\n>  \t\t\"$HTTPD_URL/smart/fetch.git\" download-3 &&\n>\n> -\t# As long as we have continguous successful downloads,\n> +\t# As long as we have contiguous successful downloads,\n\nContiguous in the sense of “next or near in time or sequence”.  Makes\nsense in this context.\n\n> […]\n> diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh\n> index 06c1301222..2458e9d0eb 100755\n> --- a/t/t7064-wtstatus-pv2.sh\n> +++ b/t/t7064-wtstatus-pv2.sh\n> @@ -77,7 +77,7 @@ test_expect_success 'before initial commit, things\n> added (-z)' '\n>  \ttest_cmp expect actual\n>  '\n>\n> -test_expect_success 'make first commit, comfirm HEAD oid and branch' '\n> +test_expect_success 'make first commit, confirm HEAD oid and branch' '\n\nEasy to mistake m/n in monospace font. :P\n\n> […]\n"},{"id":"505962","messageId":"ZxlBedgkkNfOJ8BX@nand.local","threadId":"62398","inReplyTo":"fa5d771b-5819-4ede-bc95-9d50c456c619@app.fastmail.com","subject":"Re: [PATCH] t: fix typos","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2024-10-23T18:33:29Z","receivedAt":"2024-10-23T18:33:33Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Wed, Oct 23, 2024 at 08:00:53PM +0200, Kristoffer Haugsbakk wrote:\n> All of the changes here look good.\n\nSame, modulo the one comment below where I think the grammar is still\nwrong.\n\nThanks, Andrew, for working on this, and to Kristoffer for reviewing.\n\n> > […]\n> > diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh\n> > index bc2bada34c..aecd03d69f 100755\n> > --- a/t/t5528-push-default.sh\n> > +++ b/t/t5528-push-default.sh\n> > @@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails\n> > with upstream and simple ' '\n> >  #  - the default push succeeds\n> >  #\n> >  # A previous test expected this to fail, but for the wrong reasons:\n> > -# it expected a fail becaause the branch is new and cannot be pushed,\n> > but\n> > +# it expected a fail because the branch is new and cannot be pushed,\n>\n> Also: s/a fail/a failure/ ?\n>\n> Perhaps “to fail”.\n\nYeah, I think \"to fail\" is what was supposed to be written her, but \"a\nfailure\" would also be acceptable.\n\nThanks,\nTaylor\n"},{"id":"506013","messageId":"ZxozMR6CebV5J7H7@void.void","threadId":"62398","inReplyTo":"ZxlBedgkkNfOJ8BX@nand.local","subject":"Re: [PATCH] t: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-24T11:44:49Z","receivedAt":"2024-10-24T11:44:53Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"On Wed, Oct 23, 2024 at 02:33:29PM -0400, Taylor Blau wrote:\n> Yeah, I think \"to fail\" is what was supposed to be written her, but \"a\n> failure\" would also be acceptable.\n> \n> Thanks,\n> Taylor\n\nThank you both, on it.\n"},{"id":"506018","messageId":"20241024114721.14270-1-algonell@gmail.com","threadId":"62398","inReplyTo":"20241023170111.6638-1-algonell@gmail.com","subject":"[PATCH v2] t: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-24T11:47:20Z","receivedAt":"2024-10-24T11:47:42Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos and grammar in documentation, comments, etc.\n\nVia codespell.\n\nReported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\nv2:\n  - Fix grammar.\n\nInterdiff against v1:\n  diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh\n  index aecd03d69f..1305b1cc25 100755\n  --- a/t/t5528-push-default.sh\n  +++ b/t/t5528-push-default.sh\n  @@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails with upstream and simple ' '\n   #  - the default push succeeds\n   #\n   # A previous test expected this to fail, but for the wrong reasons:\n  -# it expected a fail because the branch is new and cannot be pushed, but\n  +# it expected to fail because the branch is new and cannot be pushed, but\n   # in fact it was failing because of an ambiguous remote\n   #\n   test_expect_failure 'push from/to new branch fails with matching ' '\n\nRange-diff against v1:\n1:  038bc65acd ! 1:  a28108d450 t: fix typos\n    @@ Metadata\n      ## Commit message ##\n         t: fix typos\n     \n    -    Fix typos in documentation, comments, etc.\n    +    Fix typos and grammar in documentation, comments, etc.\n     \n         Via codespell.\n     \n    +    Reported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>\n         Signed-off-by: Andrew Kreimer <algonell@gmail.com>\n     \n      ## t/t3431-rebase-fork-point.sh ##\n    @@ t/t5528-push-default.sh: test_expect_success 'push from/to new branch fails with\n      #\n      # A previous test expected this to fail, but for the wrong reasons:\n     -# it expected a fail becaause the branch is new and cannot be pushed, but\n    -+# it expected a fail because the branch is new and cannot be pushed, but\n    ++# it expected to fail because the branch is new and cannot be pushed, but\n      # in fact it was failing because of an ambiguous remote\n      #\n      test_expect_failure 'push from/to new branch fails with matching ' '\n\n t/t3431-rebase-fork-point.sh              |  2 +-\n t/t3504-cherry-pick-rerere.sh             |  2 +-\n t/t3920-crlf-messages.sh                  |  2 +-\n t/t5303-pack-corruption-resilience.sh     |  2 +-\n t/t5324-split-commit-graph.sh             |  2 +-\n t/t5329-pack-objects-cruft.sh             |  2 +-\n t/t5411/test-0034-report-ft.sh            |  2 +-\n t/t5411/test-0035-report-ft--porcelain.sh |  2 +-\n t/t5500-fetch-pack.sh                     |  2 +-\n t/t5528-push-default.sh                   |  2 +-\n t/t5531-deep-submodule-push.sh            |  2 +-\n t/t5558-clone-bundle-uri.sh               |  4 ++--\n t/t6200-fmt-merge-msg.sh                  | 16 ++++++++--------\n t/t6300-for-each-ref.sh                   |  2 +-\n t/t6302-for-each-ref-filter.sh            |  6 +++---\n t/t6404-recursive-merge.sh                |  2 +-\n t/t6439-merge-co-error-msgs.sh            |  2 +-\n t/t7031-verify-tag-signed-ssh.sh          |  2 +-\n t/t7064-wtstatus-pv2.sh                   |  2 +-\n t/t7413-submodule-is-active.sh            |  2 +-\n t/t7513-interpret-trailers.sh             |  4 ++--\n t/t7527-builtin-fsmonitor.sh              |  2 +-\n t/t7601-merge-pull-config.sh              |  2 +-\n t/t7702-repack-cyclic-alternate.sh        |  2 +-\n t/t8009-blame-vs-topicbranches.sh         |  2 +-\n t/t9003-help-autocorrect.sh               |  2 +-\n 26 files changed, 37 insertions(+), 37 deletions(-)\n\ndiff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh\nindex 0bb284d61d..7b9c135c6e 100755\n--- a/t/t3431-rebase-fork-point.sh\n+++ b/t/t3431-rebase-fork-point.sh\n@@ -74,7 +74,7 @@ test_rebase 'G F C D B A' --onto D main\n test_rebase 'G F C B A' --keep-base refs/heads/main\n test_rebase 'G F C B A' --keep-base main\n \n-test_expect_success 'git rebase --fork-point with ambigous refname' '\n+test_expect_success 'git rebase --fork-point with ambiguous refname' '\n \tgit checkout main &&\n \tgit checkout -b one &&\n \tgit checkout side &&\ndiff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh\nindex 597c98e9c5..109016eba9 100755\n--- a/t/t3504-cherry-pick-rerere.sh\n+++ b/t/t3504-cherry-pick-rerere.sh\n@@ -43,7 +43,7 @@ test_expect_success 'cherry-pick conflict with --rerere-autoupdate' '\n \tgit reset --hard bar-dev\n '\n \n-test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' '\n+test_expect_success 'cherry-pick conflict respects rerere.autoUpdate' '\n \ttest_config rerere.autoUpdate true &&\n \ttest_must_fail git cherry-pick foo..bar-main &&\n \ttest_cmp foo-expect foo &&\ndiff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh\nindex 50ae222f08..31877f00c7 100755\n--- a/t/t3920-crlf-messages.sh\n+++ b/t/t3920-crlf-messages.sh\n@@ -82,7 +82,7 @@ test_crlf_subject_body_and_contents() {\n \n \n test_expect_success 'Setup refs with commit and tag messages using CRLF' '\n-\ttest_commit inital &&\n+\ttest_commit initial &&\n \tcreate_crlf_refs\n '\n \ndiff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh\nindex e6a43ec9ae..b634bfb665 100755\n--- a/t/t5303-pack-corruption-resilience.sh\n+++ b/t/t5303-pack-corruption-resilience.sh\n@@ -15,7 +15,7 @@ TEST_PASSES_SANITIZE_LEAK=true\n # 1) blob_2 is a delta with blob_1 for base and blob_3 is a delta with blob2\n #    for base, such that blob_3 delta depth is 2;\n #\n-# 2) the bulk of object data is uncompressible so the text part remains\n+# 2) the bulk of object data is incompressible so the text part remains\n #    visible;\n #\n # 3) object header is always 2 bytes.\ndiff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh\nindex 77e91547ea..1193726daa 100755\n--- a/t/t5324-split-commit-graph.sh\n+++ b/t/t5324-split-commit-graph.sh\n@@ -203,7 +203,7 @@ then\n \tgraph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 \"fork\"\n fi\n \n-test_expect_success 'test merge stragety constants' '\n+test_expect_success 'test merge strategy constants' '\n \tgit clone . merge-2 &&\n \t(\n \t\tcd merge-2 &&\ndiff --git a/t/t5329-pack-objects-cruft.sh b/t/t5329-pack-objects-cruft.sh\nindex 445739d06c..54a4a49997 100755\n--- a/t/t5329-pack-objects-cruft.sh\n+++ b/t/t5329-pack-objects-cruft.sh\n@@ -690,7 +690,7 @@ test_expect_success 'cruft --local drops unreachable objects' '\n \ttest_when_finished \"rm -fr alternate repo\" &&\n \n \ttest_commit -C alternate base &&\n-\t# Pack all objects in alterate so that the cruft repack in \"repo\" sees\n+\t# Pack all objects in alternate so that the cruft repack in \"repo\" sees\n \t# the object it dropped due to `--local` as packed. Otherwise this\n \t# object would not appear packed anywhere (since it is not packed in\n \t# alternate and likewise not part of the cruft pack in the other repo\ndiff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh\nindex 0e37535065..78d0b63876 100644\n--- a/t/t5411/test-0034-report-ft.sh\n+++ b/t/t5411/test-0034-report-ft.sh\n@@ -10,7 +10,7 @@ test_expect_success \"setup proc-receive hook (ft, $PROTOCOL)\" '\n # Refs of upstream : main(A)\n # Refs of workbench: main(A)  tags/v123\n # git push         :                       refs/for/main/topic(B)\n-test_expect_success \"proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)\" '\n+test_expect_success \"proc-receive: fall through, let receive-pack to execute ($PROTOCOL)\" '\n \tgit -C workbench push origin \\\n \t\t$B:refs/for/main/topic \\\n \t\t>out 2>&1 &&\ndiff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh\nindex b9a05181f1..df5fc212be 100644\n--- a/t/t5411/test-0035-report-ft--porcelain.sh\n+++ b/t/t5411/test-0035-report-ft--porcelain.sh\n@@ -10,7 +10,7 @@ test_expect_success \"setup proc-receive hook (fall-through, $PROTOCOL/porcelain)\n # Refs of upstream : main(A)\n # Refs of workbench: main(A)  tags/v123\n # git push         :                       refs/for/main/topic(B)\n-test_expect_success \"proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)\" '\n+test_expect_success \"proc-receive: fall through, let receive-pack to execute ($PROTOCOL/porcelain)\" '\n \tgit -C workbench push --porcelain origin \\\n \t\t$B:refs/for/main/topic \\\n \t\t>out 2>&1 &&\ndiff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh\nindex 605f17240c..bd08187d1b 100755\n--- a/t/t5500-fetch-pack.sh\n+++ b/t/t5500-fetch-pack.sh\n@@ -418,7 +418,7 @@ test_expect_success 'in_vain not triggered before first ACK' '\n \ttest_grep \"remote: Total 3 \" log\n '\n \n-test_expect_success 'in_vain resetted upon ACK' '\n+test_expect_success 'in_vain reset upon ACK' '\n \ttest_when_finished rm -f log trace2 &&\n \trm -rf myserver myclient &&\n \tgit init myserver &&\ndiff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh\nindex bc2bada34c..1305b1cc25 100755\n--- a/t/t5528-push-default.sh\n+++ b/t/t5528-push-default.sh\n@@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails with upstream and simple ' '\n #  - the default push succeeds\n #\n # A previous test expected this to fail, but for the wrong reasons:\n-# it expected a fail becaause the branch is new and cannot be pushed, but\n+# it expected to fail because the branch is new and cannot be pushed, but\n # in fact it was failing because of an ambiguous remote\n #\n test_expect_failure 'push from/to new branch fails with matching ' '\ndiff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh\nindex 135823630a..dcfef67af4 100755\n--- a/t/t5531-deep-submodule-push.sh\n+++ b/t/t5531-deep-submodule-push.sh\n@@ -204,7 +204,7 @@ test_expect_success 'push recurse-submodules last one wins on command line' '\n \t\tcd work/gar/bage &&\n \t\t>recurse-check-on-command-line-overriding-earlier-command-line &&\n \t\tgit add recurse-check-on-command-line-overriding-earlier-command-line &&\n-\t\tgit commit -m \"Recurse on command-line overridiing earlier command-line junk\"\n+\t\tgit commit -m \"Recurse on command-line overriding earlier command-line junk\"\n \t) &&\n \t(\n \t\tcd work &&\ndiff --git a/t/t5558-clone-bundle-uri.sh b/t/t5558-clone-bundle-uri.sh\nindex cd05321e17..3816ed5058 100755\n--- a/t/t5558-clone-bundle-uri.sh\n+++ b/t/t5558-clone-bundle-uri.sh\n@@ -945,7 +945,7 @@ test_expect_success 'creationToken heuristic with failed downloads (clone)' '\n \t\t--bundle-uri=\"$HTTPD_URL/bundle-list\" \\\n \t\t\"$HTTPD_URL/smart/fetch.git\" download-3 &&\n \n-\t# As long as we have continguous successful downloads,\n+\t# As long as we have contiguous successful downloads,\n \t# we _do_ set these configs.\n \ttest_cmp_config -C download-3 \"$HTTPD_URL/bundle-list\" fetch.bundleuri &&\n \ttest_cmp_config -C download-3 3 fetch.bundlecreationtoken &&\n@@ -1189,7 +1189,7 @@ test_expect_success 'creationToken heuristic with failed downloads (fetch)' '\n \tGIT_TRACE2_EVENT=\"$(pwd)/trace-fetch-3.txt\" \\\n \t\tgit -C fetch-3 fetch origin &&\n \n-\t# As long as we have continguous successful downloads,\n+\t# As long as we have contiguous successful downloads,\n \t# we _do_ set the maximum creation token.\n \ttest_cmp_config -C fetch-3 6 fetch.bundlecreationtoken &&\n \ndiff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh\nindex ac57b0e4ae..0a4388f343 100755\n--- a/t/t6200-fmt-merge-msg.sh\n+++ b/t/t6200-fmt-merge-msg.sh\n@@ -608,34 +608,34 @@ test_expect_success 'merge-msg with \"merging\" an annotated tag' '\n \n \tgit checkout main^0 &&\n \tgit commit --allow-empty -m \"One step ahead\" &&\n-\tgit tag -a -m \"An annotated one\" annote HEAD &&\n+\tgit tag -a -m \"An annotated one\" annotate HEAD &&\n \n \tgit checkout main &&\n-\tgit fetch . annote &&\n+\tgit fetch . annotate &&\n \n \tgit fmt-merge-msg <.git/FETCH_HEAD >actual &&\n \t{\n \t\tcat <<-\\EOF\n-\t\tMerge tag '\\''annote'\\''\n+\t\tMerge tag '\\''annotate'\\''\n \n \t\tAn annotated one\n \n-\t\t* tag '\\''annote'\\'':\n+\t\t* tag '\\''annotate'\\'':\n \t\t  One step ahead\n \t\tEOF\n \t} >expected &&\n \ttest_cmp expected actual &&\n \n \ttest_when_finished \"git reset --hard\" &&\n-\tannote=$(git rev-parse annote) &&\n-\tgit merge --no-commit --no-ff $annote &&\n+\tannotate=$(git rev-parse annotate) &&\n+\tgit merge --no-commit --no-ff $annotate &&\n \t{\n \t\tcat <<-EOF\n-\t\tMerge tag '\\''$annote'\\''\n+\t\tMerge tag '\\''$annotate'\\''\n \n \t\tAn annotated one\n \n-\t\t* tag '\\''$annote'\\'':\n+\t\t* tag '\\''$annotate'\\'':\n \t\t  One step ahead\n \t\tEOF\n \t} >expected &&\ndiff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh\nindex b3163629c5..c39d4e7e9c 100755\n--- a/t/t6300-for-each-ref.sh\n+++ b/t/t6300-for-each-ref.sh\n@@ -770,7 +770,7 @@ test_expect_success 'describe:abbrev=... vs describe --abbrev=...' '\n \t\t\trefs/heads/master >actual &&\n \t\ttest_cmp expect actual &&\n \n-\t\t# Make sure the hash used is atleast 14 digits long\n+\t\t# Make sure the hash used is at least 14 digits long\n \t\tsed -e \"s/^.*-g\\([0-9a-f]*\\)$/\\1/\" <actual >hexpart &&\n \t\ttest 15 -le $(wc -c <hexpart) &&\n \ndiff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh\nindex 7f44d3c3f2..a3e1258a4c 100755\n--- a/t/t6302-for-each-ref-filter.sh\n+++ b/t/t6302-for-each-ref-filter.sh\n@@ -14,7 +14,7 @@ test_expect_success 'setup some history and refs' '\n \tgit checkout -b side &&\n \ttest_commit four &&\n \tgit tag -m \"An annotated tag\" annotated-tag &&\n-\tgit tag -m \"Annonated doubly\" doubly-annotated-tag annotated-tag &&\n+\tgit tag -m \"Annotated doubly\" doubly-annotated-tag annotated-tag &&\n \n \t# Note that these \"signed\" tags might not actually be signed.\n \t# Tests which care about the distinction should be marked\n@@ -343,7 +343,7 @@ test_expect_success 'check `%(contents:lines=1)`' '\n \tside |four\n \todd/spot |three\n \tannotated-tag |An annotated tag\n-\tdoubly-annotated-tag |Annonated doubly\n+\tdoubly-annotated-tag |Annotated doubly\n \tdoubly-signed-tag |Signed doubly\n \tfour |four\n \tone |one\n@@ -379,7 +379,7 @@ test_expect_success 'check `%(contents:lines=99999)`' '\n \tside |four\n \todd/spot |three\n \tannotated-tag |An annotated tag\n-\tdoubly-annotated-tag |Annonated doubly\n+\tdoubly-annotated-tag |Annotated doubly\n \tdoubly-signed-tag |Signed doubly\n \tfour |four\n \tone |one\ndiff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh\nindex 36215518b6..57169ca24b 100755\n--- a/t/t6404-recursive-merge.sh\n+++ b/t/t6404-recursive-merge.sh\n@@ -88,7 +88,7 @@ test_expect_success 'result contains a conflict' '\n '\n \n test_expect_success 'virtual trees were processed' '\n-\t# TODO: fragile test, relies on ambigious merge-base resolution\n+\t# TODO: fragile test, relies on ambiguous merge-base resolution\n \tgit ls-files --stage >out &&\n \n \tcat >expect <<-EOF &&\ndiff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh\nindex 0cbec57cda..a9804ae42f 100755\n--- a/t/t6439-merge-co-error-msgs.sh\n+++ b/t/t6439-merge-co-error-msgs.sh\n@@ -65,7 +65,7 @@ Please move or remove them before you merge.\n Aborting\n EOF\n \n-test_expect_success 'untracked files or local changes ovewritten by merge' '\n+test_expect_success 'untracked files or local changes overwritten by merge' '\n \tgit add two &&\n \tgit add three &&\n \tgit add four &&\ndiff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh\nindex 20913b3713..80359d48f7 100755\n--- a/t/t7031-verify-tag-signed-ssh.sh\n+++ b/t/t7031-verify-tag-signed-ssh.sh\n@@ -116,7 +116,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag succeeds with tag date\n \t! grep \"${GPGSSH_BAD_SIGNATURE}\" actual\n '\n \n-test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag failes with tag date outside of key validity' '\n+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag fails with tag date outside of key validity' '\n \ttest_config gpg.ssh.allowedSignersFile \"${GPGSSH_ALLOWED_SIGNERS}\" &&\n \ttest_must_fail git verify-tag timeboxedinvalid-signed 2>actual &&\n \t! grep \"${GPGSSH_GOOD_SIGNATURE_TRUSTED}\" actual\ndiff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh\nindex 06c1301222..2458e9d0eb 100755\n--- a/t/t7064-wtstatus-pv2.sh\n+++ b/t/t7064-wtstatus-pv2.sh\n@@ -77,7 +77,7 @@ test_expect_success 'before initial commit, things added (-z)' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'make first commit, comfirm HEAD oid and branch' '\n+test_expect_success 'make first commit, confirm HEAD oid and branch' '\n \tgit commit -m initial &&\n \tH0=$(git rev-parse HEAD) &&\n \tcat >expect <<-EOF &&\ndiff --git a/t/t7413-submodule-is-active.sh b/t/t7413-submodule-is-active.sh\nindex 887d181b72..b9c89b1019 100755\n--- a/t/t7413-submodule-is-active.sh\n+++ b/t/t7413-submodule-is-active.sh\n@@ -22,7 +22,7 @@ test_expect_success 'setup' '\n \tgit -C super submodule add ../sub sub2 &&\n \n \t# Remove submodule.<name>.active entries in order to test in an\n-\t# environment where only URLs are present in the conifg\n+\t# environment where only URLs are present in the config\n \tgit -C super config --unset submodule.sub1.active &&\n \tgit -C super config --unset submodule.sub2.active &&\n \ndiff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh\nindex 0f7d8938d9..818a8dafbd 100755\n--- a/t/t7513-interpret-trailers.sh\n+++ b/t/t7513-interpret-trailers.sh\n@@ -857,7 +857,7 @@ test_expect_success 'using \"--where after\" with \"--no-where\"' '\n # the hardcoded default (in WHERE_END) assuming the absence of .gitconfig).\n # Here, the \"start\" setting of trailer.where is respected, so the new \"Acked-by\"\n # and \"Bug\" trailers are placed at the beginning, and not at the end which is\n-# the harcoded default.\n+# the hardcoded default.\n test_expect_success 'using \"--where after\" with \"--no-where\" defaults to configuration' '\n \ttest_config trailer.ack.key \"Acked-by= \" &&\n \ttest_config trailer.bug.key \"Bug #\" &&\n@@ -881,7 +881,7 @@ test_expect_success 'using \"--where after\" with \"--no-where\" defaults to configu\n # immediately after it. For the next trailer (Bug #42), we default to using the\n # hardcoded WHERE_END because we don't have any \"trailer.where\" or\n # \"trailer.bug.where\" configured.\n-test_expect_success 'using \"--no-where\" defaults to harcoded default if nothing configured' '\n+test_expect_success 'using \"--no-where\" defaults to hardcoded default if nothing configured' '\n \ttest_config trailer.ack.key \"Acked-by= \" &&\n \ttest_config trailer.bug.key \"Bug #\" &&\n \ttest_config trailer.separators \":=#\" &&\ndiff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh\nindex 9b15baa02d..409cd0cd12 100755\n--- a/t/t7527-builtin-fsmonitor.sh\n+++ b/t/t7527-builtin-fsmonitor.sh\n@@ -765,7 +765,7 @@ done\n # by the FSMonitor response to skip those recursive calls.  That is,\n # even if FSMonitor says that the mtime of the submodule directory\n # hasn't changed and it could be implicitly marked valid, we must\n-# not take that shortcut.  We need to force the recusion into the\n+# not take that shortcut.  We need to force the recursion into the\n # submodule so that we get a summary of the status *within* the\n # submodule.\n \ndiff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh\nindex 7fd8c086af..c83298ba68 100755\n--- a/t/t7601-merge-pull-config.sh\n+++ b/t/t7601-merge-pull-config.sh\n@@ -281,7 +281,7 @@ test_expect_success '--rebase overrides pull.ff unset' '\n \ttest_does_rebase pull --rebase\n '\n \n-# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff\n+# Group 4: --no-rebase heeds pull.ff=!only or explicit --ff or --no-ff\n \n test_expect_success '--no-rebase works with --no-ff' '\n \ttest_does_merge_when_ff_possible pull --no-rebase --no-ff\ndiff --git a/t/t7702-repack-cyclic-alternate.sh b/t/t7702-repack-cyclic-alternate.sh\nindex f3cdb98eec..d151d4f603 100755\n--- a/t/t7702-repack-cyclic-alternate.sh\n+++ b/t/t7702-repack-cyclic-alternate.sh\n@@ -18,7 +18,7 @@ test_expect_success setup '\n \techo \"$(pwd)\"/.git/objects/../objects >.git/objects/info/alternates\n '\n \n-test_expect_success 're-packing repository with itsself as alternate' '\n+test_expect_success 're-packing repository with itself as alternate' '\n \tgit repack -adl &&\n \tgit fsck\n '\ndiff --git a/t/t8009-blame-vs-topicbranches.sh b/t/t8009-blame-vs-topicbranches.sh\nindex 30331713b9..cc51108464 100755\n--- a/t/t8009-blame-vs-topicbranches.sh\n+++ b/t/t8009-blame-vs-topicbranches.sh\n@@ -1,6 +1,6 @@\n #!/bin/sh\n \n-test_description='blaming trough history with topic branches'\n+test_description='blaming through history with topic branches'\n \n TEST_PASSES_SANITIZE_LEAK=true\n . ./test-lib.sh\ndiff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh\nindex 14a704d0a8..3be063afab 100755\n--- a/t/t9003-help-autocorrect.sh\n+++ b/t/t9003-help-autocorrect.sh\n@@ -65,7 +65,7 @@ test_expect_success 'autocorrect can be declined altogether' '\n test_expect_success 'autocorrect works in work tree created from bare repo' '\n \tgit clone --bare . bare.git &&\n \tgit -C bare.git worktree add ../worktree &&\n-\tgit -C worktree -c help.autocorrect=immediate stauts\n+\tgit -C worktree -c help.autocorrect=immediate status\n '\n \n test_done\n-- \n2.39.5\n\n"},{"id":"506048","messageId":"Zxp55YTXyRT5wGuo@nand.local","threadId":"62398","inReplyTo":"20241024114721.14270-1-algonell@gmail.com","subject":"Re: [PATCH v2] t: fix typos","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2024-10-24T16:46:29Z","receivedAt":"2024-10-24T16:46:32Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Thu, Oct 24, 2024 at 02:47:20PM +0300, Andrew Kreimer wrote:\n> Interdiff against v1:\n>   diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh\n>   index aecd03d69f..1305b1cc25 100755\n>   --- a/t/t5528-push-default.sh\n>   +++ b/t/t5528-push-default.sh\n>   @@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails with upstream and simple ' '\n>    #  - the default push succeeds\n>    #\n>    # A previous test expected this to fail, but for the wrong reasons:\n>   -# it expected a fail because the branch is new and cannot be pushed, but\n>   +# it expected to fail because the branch is new and cannot be pushed, but\n>    # in fact it was failing because of an ambiguous remote\n>    #\n>    test_expect_failure 'push from/to new branch fails with matching ' '\n\nThanks, looks good to me. Let's start merging this one down.\n\nThanks,\nTaylor\n"},{"id":"506053","messageId":"35e4259a-d442-4b8f-a986-412e04a64770@app.fastmail.com","threadId":"62398","inReplyTo":"20241024114721.14270-1-algonell@gmail.com","subject":"Re: [PATCH v2] t: fix typos","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2024-10-24T17:07:00Z","receivedAt":"2024-10-24T17:07:39Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Thu, Oct 24, 2024, at 13:47, Andrew Kreimer wrote:\n> Fix typos and grammar in documentation, comments, etc.\n>\n> Via codespell.\n\nNice work here\n\n> Reported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>\n> Signed-off-by: Andrew Kreimer <algonell@gmail.com>\n\nJust for future series, I think crediting people in the commit message\nfor minor review work is overkill.  “Reported-by” in particular is often\nused for something more substantial like finding a bug.\n\nThat’s my impression anyway, mainly from reading this list.\n\n-- \nKristoffer Haugsbakk\n\n"},{"id":"506095","messageId":"Zxtiz-h7m5YF4Q2N@void.void","threadId":"62398","inReplyTo":"35e4259a-d442-4b8f-a986-412e04a64770@app.fastmail.com","subject":"Re: [PATCH v2] t: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-25T09:20:15Z","receivedAt":"2024-10-25T09:20:19Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"On Thu, Oct 24, 2024 at 07:07:00PM +0200, Kristoffer Haugsbakk wrote:\n> Just for future series, I think crediting people in the commit message\n> for minor review work is overkill.  “Reported-by” in particular is often\n> used for something more substantial like finding a bug.\n> \n> That’s my impression anyway, mainly from reading this list.\n> \n> -- \n> Kristoffer Haugsbakk\n\nNoted, thank you.\n"}]}