t: fix typos
Fix typos and grammar in documentation, comments, etc. Via codespell. Reported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com> Signed-off-by: Andrew Kreimer <algonell@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
Andrew Kreimer committed
Oct 24, 2024 at 14:47 UTC
f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5
26 files changed
+37
-37
t/t3431-rebase-fork-point.sh
+1
-1
@@ -74,7 +74,7 @@ test_rebase 'G F C D B A' --onto D main
74
test_rebase 'G F C B A' --keep-base refs/heads/main
75
test_rebase 'G F C B A' --keep-base main
76
77
-test_expect_success 'git rebase --fork-point with ambigous refname' '
77
+test_expect_success 'git rebase --fork-point with ambiguous refname' '
78
git checkout main &&
79
git checkout -b one &&
80
git checkout side &&
t/t3504-cherry-pick-rerere.sh
+1
-1
@@ -43,7 +43,7 @@ test_expect_success 'cherry-pick conflict with --rerere-autoupdate' '
43
git reset --hard bar-dev
44
'
45
46
-test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' '
46
+test_expect_success 'cherry-pick conflict respects rerere.autoUpdate' '
47
test_config rerere.autoUpdate true &&
48
test_must_fail git cherry-pick foo..bar-main &&
49
test_cmp foo-expect foo &&
t/t3920-crlf-messages.sh
+1
-1
@@ -82,7 +82,7 @@ test_crlf_subject_body_and_contents() {
82
83
84
test_expect_success 'Setup refs with commit and tag messages using CRLF' '
85
- test_commit inital &&
85
+ test_commit initial &&
86
create_crlf_refs
87
'
88
t/t5303-pack-corruption-resilience.sh
+1
-1
@@ -15,7 +15,7 @@ TEST_PASSES_SANITIZE_LEAK=true
15
# 1) blob_2 is a delta with blob_1 for base and blob_3 is a delta with blob2
16
# for base, such that blob_3 delta depth is 2;
17
#
18
-# 2) the bulk of object data is uncompressible so the text part remains
18
+# 2) the bulk of object data is incompressible so the text part remains
19
# visible;
20
#
21
# 3) object header is always 2 bytes.
t/t5324-split-commit-graph.sh
+1
-1
@@ -203,7 +203,7 @@ then
203
graph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 "fork"
204
fi
205
206
-test_expect_success 'test merge stragety constants' '
206
+test_expect_success 'test merge strategy constants' '
207
git clone . merge-2 &&
208
(
209
cd merge-2 &&
t/t5329-pack-objects-cruft.sh
+1
-1
@@ -690,7 +690,7 @@ test_expect_success 'cruft --local drops unreachable objects' '
690
test_when_finished "rm -fr alternate repo" &&
691
692
test_commit -C alternate base &&
693
- # Pack all objects in alterate so that the cruft repack in "repo" sees
693
+ # Pack all objects in alternate so that the cruft repack in "repo" sees
694
# the object it dropped due to `--local` as packed. Otherwise this
695
# object would not appear packed anywhere (since it is not packed in
696
# alternate and likewise not part of the cruft pack in the other repo
t/t5411/test-0034-report-ft.sh
+1
-1
@@ -10,7 +10,7 @@ test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" '
10
# Refs of upstream : main(A)
11
# Refs of workbench: main(A) tags/v123
12
# git push : refs/for/main/topic(B)
13
-test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)" '
13
+test_expect_success "proc-receive: fall through, let receive-pack to execute ($PROTOCOL)" '
14
git -C workbench push origin \
15
$B:refs/for/main/topic \
16
>out 2>&1 &&
t/t5411/test-0035-report-ft--porcelain.sh
+1
-1
@@ -10,7 +10,7 @@ test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain)
10
# Refs of upstream : main(A)
11
# Refs of workbench: main(A) tags/v123
12
# git push : refs/for/main/topic(B)
13
-test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)" '
13
+test_expect_success "proc-receive: fall through, let receive-pack to execute ($PROTOCOL/porcelain)" '
14
git -C workbench push --porcelain origin \
15
$B:refs/for/main/topic \
16
>out 2>&1 &&
t/t5500-fetch-pack.sh
+1
-1
@@ -418,7 +418,7 @@ test_expect_success 'in_vain not triggered before first ACK' '
418
test_grep "remote: Total 3 " log
419
'
420
421
-test_expect_success 'in_vain resetted upon ACK' '
421
+test_expect_success 'in_vain reset upon ACK' '
422
test_when_finished rm -f log trace2 &&
423
rm -rf myserver myclient &&
424
git init myserver &&
t/t5528-push-default.sh
+1
-1
@@ -147,7 +147,7 @@ test_expect_success 'push from/to new branch fails with upstream and simple ' '
147
# - the default push succeeds
148
#
149
# A previous test expected this to fail, but for the wrong reasons:
150
-# it expected a fail becaause the branch is new and cannot be pushed, but
150
+# it expected to fail because the branch is new and cannot be pushed, but
151
# in fact it was failing because of an ambiguous remote
152
#
153
test_expect_failure 'push from/to new branch fails with matching ' '
t/t5531-deep-submodule-push.sh
+1
-1
@@ -204,7 +204,7 @@ test_expect_success 'push recurse-submodules last one wins on command line' '
204
cd work/gar/bage &&
205
>recurse-check-on-command-line-overriding-earlier-command-line &&
206
git add recurse-check-on-command-line-overriding-earlier-command-line &&
207
- git commit -m "Recurse on command-line overridiing earlier command-line junk"
207
+ git commit -m "Recurse on command-line overriding earlier command-line junk"
208
) &&
209
(
210
cd work &&
t/t5558-clone-bundle-uri.sh
+2
-2
@@ -945,7 +945,7 @@ test_expect_success 'creationToken heuristic with failed downloads (clone)' '
945
--bundle-uri="$HTTPD_URL/bundle-list" \
946
"$HTTPD_URL/smart/fetch.git" download-3 &&
947
948
- # As long as we have continguous successful downloads,
948
+ # As long as we have contiguous successful downloads,
949
# we _do_ set these configs.
950
test_cmp_config -C download-3 "$HTTPD_URL/bundle-list" fetch.bundleuri &&
951
test_cmp_config -C download-3 3 fetch.bundlecreationtoken &&
@@ -1189,7 +1189,7 @@ test_expect_success 'creationToken heuristic with failed downloads (fetch)' '
1189
GIT_TRACE2_EVENT="$(pwd)/trace-fetch-3.txt" \
1190
git -C fetch-3 fetch origin &&
1191
1192
- # As long as we have continguous successful downloads,
1192
+ # As long as we have contiguous successful downloads,
1193
# we _do_ set the maximum creation token.
1194
test_cmp_config -C fetch-3 6 fetch.bundlecreationtoken &&
1195
t/t6200-fmt-merge-msg.sh
+8
-8
@@ -608,34 +608,34 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
608
609
git checkout main^0 &&
610
git commit --allow-empty -m "One step ahead" &&
611
- git tag -a -m "An annotated one" annote HEAD &&
611
+ git tag -a -m "An annotated one" annotate HEAD &&
612
613
git checkout main &&
614
- git fetch . annote &&
614
+ git fetch . annotate &&
615
616
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
617
{
618
cat <<-\EOF
619
- Merge tag '\''annote'\''
619
+ Merge tag '\''annotate'\''
620
621
An annotated one
622
623
- * tag '\''annote'\'':
623
+ * tag '\''annotate'\'':
624
One step ahead
625
EOF
626
} >expected &&
627
test_cmp expected actual &&
628
629
test_when_finished "git reset --hard" &&
630
- annote=$(git rev-parse annote) &&
631
- git merge --no-commit --no-ff $annote &&
630
+ annotate=$(git rev-parse annotate) &&
631
+ git merge --no-commit --no-ff $annotate &&
632
{
633
cat <<-EOF
634
- Merge tag '\''$annote'\''
634
+ Merge tag '\''$annotate'\''
635
636
An annotated one
637
638
- * tag '\''$annote'\'':
638
+ * tag '\''$annotate'\'':
639
One step ahead
640
EOF
641
} >expected &&
t/t6300-for-each-ref.sh
+1
-1
@@ -770,7 +770,7 @@ test_expect_success 'describe:abbrev=... vs describe --abbrev=...' '
770
refs/heads/master >actual &&
771
test_cmp expect actual &&
772
773
- # Make sure the hash used is atleast 14 digits long
773
+ # Make sure the hash used is at least 14 digits long
774
sed -e "s/^.*-g\([0-9a-f]*\)$/\1/" <actual >hexpart &&
775
test 15 -le $(wc -c <hexpart) &&
776
t/t6302-for-each-ref-filter.sh
+3
-3
@@ -14,7 +14,7 @@ test_expect_success 'setup some history and refs' '
14
git checkout -b side &&
15
test_commit four &&
16
git tag -m "An annotated tag" annotated-tag &&
17
- git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag &&
17
+ git tag -m "Annotated doubly" doubly-annotated-tag annotated-tag &&
18
19
# Note that these "signed" tags might not actually be signed.
20
# Tests which care about the distinction should be marked
@@ -343,7 +343,7 @@ test_expect_success 'check `%(contents:lines=1)`' '
343
side |four
344
odd/spot |three
345
annotated-tag |An annotated tag
346
- doubly-annotated-tag |Annonated doubly
346
+ doubly-annotated-tag |Annotated doubly
347
doubly-signed-tag |Signed doubly
348
four |four
349
one |one
@@ -379,7 +379,7 @@ test_expect_success 'check `%(contents:lines=99999)`' '
379
side |four
380
odd/spot |three
381
annotated-tag |An annotated tag
382
- doubly-annotated-tag |Annonated doubly
382
+ doubly-annotated-tag |Annotated doubly
383
doubly-signed-tag |Signed doubly
384
four |four
385
one |one
t/t6404-recursive-merge.sh
+1
-1
@@ -88,7 +88,7 @@ test_expect_success 'result contains a conflict' '
88
'
89
90
test_expect_success 'virtual trees were processed' '
91
- # TODO: fragile test, relies on ambigious merge-base resolution
91
+ # TODO: fragile test, relies on ambiguous merge-base resolution
92
git ls-files --stage >out &&
93
94
cat >expect <<-EOF &&
t/t6439-merge-co-error-msgs.sh
+1
-1
@@ -65,7 +65,7 @@ Please move or remove them before you merge.
65
Aborting
66
EOF
67
68
-test_expect_success 'untracked files or local changes ovewritten by merge' '
68
+test_expect_success 'untracked files or local changes overwritten by merge' '
69
git add two &&
70
git add three &&
71
git add four &&
t/t7031-verify-tag-signed-ssh.sh
+1
-1
@@ -116,7 +116,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag succeeds with tag date
116
! grep "${GPGSSH_BAD_SIGNATURE}" actual
117
'
118
119
-test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag failes with tag date outside of key validity' '
119
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag fails with tag date outside of key validity' '
120
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
121
test_must_fail git verify-tag timeboxedinvalid-signed 2>actual &&
122
! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
t/t7064-wtstatus-pv2.sh
+1
-1
@@ -77,7 +77,7 @@ test_expect_success 'before initial commit, things added (-z)' '
77
test_cmp expect actual
78
'
79
80
-test_expect_success 'make first commit, comfirm HEAD oid and branch' '
80
+test_expect_success 'make first commit, confirm HEAD oid and branch' '
81
git commit -m initial &&
82
H0=$(git rev-parse HEAD) &&
83
cat >expect <<-EOF &&
t/t7413-submodule-is-active.sh
+1
-1
@@ -22,7 +22,7 @@ test_expect_success 'setup' '
22
git -C super submodule add ../sub sub2 &&
23
24
# Remove submodule.<name>.active entries in order to test in an
25
- # environment where only URLs are present in the conifg
25
+ # environment where only URLs are present in the config
26
git -C super config --unset submodule.sub1.active &&
27
git -C super config --unset submodule.sub2.active &&
28
t/t7513-interpret-trailers.sh
+2
-2
@@ -857,7 +857,7 @@ test_expect_success 'using "--where after" with "--no-where"' '
857
# the hardcoded default (in WHERE_END) assuming the absence of .gitconfig).
858
# Here, the "start" setting of trailer.where is respected, so the new "Acked-by"
859
# and "Bug" trailers are placed at the beginning, and not at the end which is
860
-# the harcoded default.
860
+# the hardcoded default.
861
test_expect_success 'using "--where after" with "--no-where" defaults to configuration' '
862
test_config trailer.ack.key "Acked-by= " &&
863
test_config trailer.bug.key "Bug #" &&
@@ -881,7 +881,7 @@ test_expect_success 'using "--where after" with "--no-where" defaults to configu
881
# immediately after it. For the next trailer (Bug #42), we default to using the
882
# hardcoded WHERE_END because we don't have any "trailer.where" or
883
# "trailer.bug.where" configured.
884
-test_expect_success 'using "--no-where" defaults to harcoded default if nothing configured' '
884
+test_expect_success 'using "--no-where" defaults to hardcoded default if nothing configured' '
885
test_config trailer.ack.key "Acked-by= " &&
886
test_config trailer.bug.key "Bug #" &&
887
test_config trailer.separators ":=#" &&
t/t7527-builtin-fsmonitor.sh
+1
-1
@@ -765,7 +765,7 @@ done
765
# by the FSMonitor response to skip those recursive calls. That is,
766
# even if FSMonitor says that the mtime of the submodule directory
767
# hasn't changed and it could be implicitly marked valid, we must
768
-# not take that shortcut. We need to force the recusion into the
768
+# not take that shortcut. We need to force the recursion into the
769
# submodule so that we get a summary of the status *within* the
770
# submodule.
771
t/t7601-merge-pull-config.sh
+1
-1
@@ -281,7 +281,7 @@ test_expect_success '--rebase overrides pull.ff unset' '
281
test_does_rebase pull --rebase
282
'
283
284
-# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff
284
+# Group 4: --no-rebase heeds pull.ff=!only or explicit --ff or --no-ff
285
286
test_expect_success '--no-rebase works with --no-ff' '
287
test_does_merge_when_ff_possible pull --no-rebase --no-ff
t/t7702-repack-cyclic-alternate.sh
+1
-1
@@ -18,7 +18,7 @@ test_expect_success setup '
18
echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
19
'
20
21
-test_expect_success 're-packing repository with itsself as alternate' '
21
+test_expect_success 're-packing repository with itself as alternate' '
22
git repack -adl &&
23
git fsck
24
'
t/t8009-blame-vs-topicbranches.sh
+1
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test_description='blaming trough history with topic branches'
3
+test_description='blaming through history with topic branches'
4
5
TEST_PASSES_SANITIZE_LEAK=true
6
. ./test-lib.sh
t/t9003-help-autocorrect.sh
+1
-1
@@ -65,7 +65,7 @@ test_expect_success 'autocorrect can be declined altogether' '
65
test_expect_success 'autocorrect works in work tree created from bare repo' '
66
git clone --bare . bare.git &&
67
git -C bare.git worktree add ../worktree &&
68
- git -C worktree -c help.autocorrect=immediate stauts
68
+ git -C worktree -c help.autocorrect=immediate status
69
'
70
71
test_done