Skip to content

Commit b3ba1ef

Browse files
committed
Merge branch 'ak/typofixes' into maint-2.47
Typofixes. * ak/typofixes: t: fix typos t/helper: fix a typo t/perf: fix typos t/unit-tests: fix typos contrib: fix typos compat: fix typos
2 parents 00c388f + 41869f7 commit b3ba1ef

File tree

15 files changed

+18
-18
lines changed

15 files changed

+18
-18
lines changed

compat/fsmonitor/fsm-listen-win32.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,9 @@ static int recv_rdcw_watch(struct one_watch *watch)
431431
* but I observed ERROR_ACCESS_DENIED (0x05) errors during
432432
* testing.
433433
*
434-
* Note that we only get notificaiton events for events
434+
* Note that we only get notification events for events
435435
* *within* the directory, not *on* the directory itself.
436-
* (These might be properies of the parent directory, for
436+
* (These might be properties of the parent directory, for
437437
* example).
438438
*
439439
* NEEDSWORK: We might try to check for the deleted directory

compat/regex/regexec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
292292
concerned.
293293
294294
If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match
295-
and all groups is stroed in REGS. (For the "_2" variants, the offsets are
295+
and all groups are stored in REGS. (For the "_2" variants, the offsets are
296296
computed relative to the concatenation, not relative to the individual
297297
strings.)
298298

compat/simple-ipc/ipc-unix-socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ static int accept_thread__wait_for_connection(
713713
* Block SIGPIPE in this thread for the life of the thread. This
714714
* avoids any stray SIGPIPE signals when closing pipe fds under
715715
* extremely heavy loads (such as when the fifo queue is full and we
716-
* drop incomming connections).
716+
* drop incoming connections).
717717
*/
718718
static void *accept_thread_proc(void *_accept_thread_data)
719719
{

contrib/completion/git-completion.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3296,7 +3296,7 @@ __gitcomp_directories ()
32963296
# i.e. which are *already* part of their
32973297
# sparse-checkout. Thus, normal file and directory
32983298
# completion is always useless for "git
3299-
# sparse-checkout add" and is also probelmatic for
3299+
# sparse-checkout add" and is also problematic for
33003300
# "git sparse-checkout set" unless using it to
33013301
# strictly narrow the checkout.
33023302
COMPREPLY=( "" )
@@ -3698,7 +3698,7 @@ _git_worktree ()
36983698
# Here we are not completing an --option, it's either the
36993699
# path or a ref.
37003700
case "$prev" in
3701-
-b|-B) # Complete refs for branch to be created/reseted.
3701+
-b|-B) # Complete refs for branch to be created/reset.
37023702
__git_complete_refs
37033703
;;
37043704
-*) # The previous word is an -o|--option without an

contrib/subtree/git-subtree.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ cmd_split () {
946946
rev=$(git rev-parse -q --verify "$1^{commit}") ||
947947
die "fatal: '$1' does not refer to a commit"
948948
else
949-
die "fatal: you must provide exactly one revision, and optionnally a repository. Got: '$*'"
949+
die "fatal: you must provide exactly one revision, and optionally a repository. Got: '$*'"
950950
fi
951951
repository=""
952952
if test "$#" = 2

contrib/subtree/t/t7900-subtree.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ last_commit_subject () {
4747
# pre-2.32.0 versions of 'git subtree' would write the hash of the tag
4848
# (sub1 below), instead of the commit (sub1^{commit}) in the
4949
# "git-subtree-split" trailer.
50-
# We immitate this behaviour below using a replace ref.
50+
# We imitate this behaviour below using a replace ref.
5151
# This function creates 3 repositories:
5252
# - $1
5353
# - $1-sub (added as subtree "sub" in $1)

t/helper/test-rot13-filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* ("clean", "smudge", etc).
1010
*
1111
* When --always-delay is given all pathnames with the "can-delay" flag
12-
* that don't appear on the list bellow are delayed with a count of 1
12+
* that don't appear on the list below are delayed with a count of 1
1313
* (see more below).
1414
*
1515
* This implementation supports special test cases:

t/lib-bundle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ convert_bundle_to_pack () {
1111
}
1212

1313
# Check count of objects in a bundle file.
14-
# We can use "--thin" opiton to check thin pack, which must be fixed by
14+
# We can use "--thin" option to check thin pack, which must be fixed by
1515
# command `git-index-pack --fix-thin --stdin`.
1616
test_bundle_object_count () {
1717
thin=

t/lib-rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ set_reword_editor () {
187187
exit 1
188188
fi
189189
fi &&
190-
# There should be no uncommited changes
190+
# There should be no uncommitted changes
191191
git diff --exit-code HEAD &&
192192
# The todo-list should be re-read after a reword
193193
GIT_SEQUENCE_EDITOR="\"$PWD/reword-sequence-editor.sh\"" \

t/lib-sudo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ run_with_sudo () {
66
local RUN="$TEST_DIRECTORY/$$.sh"
77
write_script "$RUN" "$TEST_SHELL_PATH"
88
# avoid calling "$RUN" directly so sudo doesn't get a chance to
9-
# override the shell, add aditional restrictions or even reject
9+
# override the shell, add additional restrictions or even reject
1010
# running the script because its security policy deem it unsafe
1111
sudo "$TEST_SHELL_PATH" -c "\"$RUN\""
1212
ret=$?

0 commit comments

Comments
 (0)