Git fork

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

+18 -18
+2 -2
compat/fsmonitor/fsm-listen-win32.c
··· 431 431 * but I observed ERROR_ACCESS_DENIED (0x05) errors during 432 432 * testing. 433 433 * 434 - * Note that we only get notificaiton events for events 434 + * Note that we only get notification events for events 435 435 * *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 437 437 * example). 438 438 * 439 439 * NEEDSWORK: We might try to check for the deleted directory
+1 -1
compat/regex/regexec.c
··· 292 292 concerned. 293 293 294 294 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 296 296 computed relative to the concatenation, not relative to the individual 297 297 strings.) 298 298
+1 -1
compat/simple-ipc/ipc-unix-socket.c
··· 713 713 * Block SIGPIPE in this thread for the life of the thread. This 714 714 * avoids any stray SIGPIPE signals when closing pipe fds under 715 715 * extremely heavy loads (such as when the fifo queue is full and we 716 - * drop incomming connections). 716 + * drop incoming connections). 717 717 */ 718 718 static void *accept_thread_proc(void *_accept_thread_data) 719 719 {
+2 -2
contrib/completion/git-completion.bash
··· 3296 3296 # i.e. which are *already* part of their 3297 3297 # sparse-checkout. Thus, normal file and directory 3298 3298 # completion is always useless for "git 3299 - # sparse-checkout add" and is also probelmatic for 3299 + # sparse-checkout add" and is also problematic for 3300 3300 # "git sparse-checkout set" unless using it to 3301 3301 # strictly narrow the checkout. 3302 3302 COMPREPLY=( "" ) ··· 3698 3698 # Here we are not completing an --option, it's either the 3699 3699 # path or a ref. 3700 3700 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. 3702 3702 __git_complete_refs 3703 3703 ;; 3704 3704 -*) # The previous word is an -o|--option without an
+1 -1
contrib/subtree/git-subtree.sh
··· 946 946 rev=$(git rev-parse -q --verify "$1^{commit}") || 947 947 die "fatal: '$1' does not refer to a commit" 948 948 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: '$*'" 950 950 fi 951 951 repository="" 952 952 if test "$#" = 2
+1 -1
contrib/subtree/t/t7900-subtree.sh
··· 47 47 # pre-2.32.0 versions of 'git subtree' would write the hash of the tag 48 48 # (sub1 below), instead of the commit (sub1^{commit}) in the 49 49 # "git-subtree-split" trailer. 50 - # We immitate this behaviour below using a replace ref. 50 + # We imitate this behaviour below using a replace ref. 51 51 # This function creates 3 repositories: 52 52 # - $1 53 53 # - $1-sub (added as subtree "sub" in $1)
+1 -1
t/helper/test-rot13-filter.c
··· 9 9 * ("clean", "smudge", etc). 10 10 * 11 11 * 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 13 13 * (see more below). 14 14 * 15 15 * This implementation supports special test cases:
+1 -1
t/lib-bundle.sh
··· 11 11 } 12 12 13 13 # 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 15 15 # command `git-index-pack --fix-thin --stdin`. 16 16 test_bundle_object_count () { 17 17 thin=
+1 -1
t/lib-rebase.sh
··· 187 187 exit 1 188 188 fi 189 189 fi && 190 - # There should be no uncommited changes 190 + # There should be no uncommitted changes 191 191 git diff --exit-code HEAD && 192 192 # The todo-list should be re-read after a reword 193 193 GIT_SEQUENCE_EDITOR="\"$PWD/reword-sequence-editor.sh\"" \
+1 -1
t/lib-sudo.sh
··· 6 6 local RUN="$TEST_DIRECTORY/$$.sh" 7 7 write_script "$RUN" "$TEST_SHELL_PATH" 8 8 # 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 10 10 # running the script because its security policy deem it unsafe 11 11 sudo "$TEST_SHELL_PATH" -c "\"$RUN\"" 12 12 ret=$?
+1 -1
t/lib-unicode-nfc-nfd.sh
··· 74 74 # Yielding: \xcf \x89 + \xcc \x94 + \xcd \x82 75 75 # 76 76 # Note that I've used the canonical ordering of the 77 - # combinining characters. It is also possible to 77 + # combining characters. It is also possible to 78 78 # swap them. My testing shows that that non-standard 79 79 # ordering also causes a collision in mkdir. However, 80 80 # the resulting names don't draw correctly on the
+1 -1
t/perf/p7527-builtin-fsmonitor.sh
··· 95 95 # time is not useful. 96 96 # 97 97 # Create a temp branch and do all work relative to it so that we don't 98 - # accidentially alter the real ballast branch. 98 + # accidentally alter the real ballast branch. 99 99 # 100 100 test_expect_success "Setup borrowed repo (temp ballast branch)" " 101 101 test_might_fail git -C $REPO checkout $BALLAST_BR &&
+2 -2
t/perf/perf-lib.sh
··· 282 282 # Run the performance test script specified in perf-test with 283 283 # optional prerequisite and setup steps. 284 284 # Options: 285 - # --prereq prerequisites: Skip the test if prequisites aren't met 285 + # --prereq prerequisites: Skip the test if prerequisites aren't met 286 286 # --setup "setup-steps": Run setup steps prior to each measured iteration 287 287 # 288 288 test_perf () { ··· 309 309 # prerequisites and setup steps. Returns the numeric value 310 310 # returned by size-test. 311 311 # Options: 312 - # --prereq prerequisites: Skip the test if prequisites aren't met 312 + # --prereq prerequisites: Skip the test if prerequisites aren't met 313 313 # --setup "setup-steps": Run setup steps prior to the size measurement 314 314 315 315 test_size () {
+1 -1
t/unit-tests/t-reftable-basics.c
··· 54 54 } 55 55 } 56 56 57 - if_test ("names_length retuns size of a NULL-terminated string array") { 57 + if_test ("names_length returns size of a NULL-terminated string array") { 58 58 const char *a[] = { "a", "b", NULL }; 59 59 check_int(names_length(a), ==, 2); 60 60 }
+1 -1
t/unit-tests/t-reftable-merged.c
··· 459 459 TEST(t_merged_logs(), "merged table with multiple log updates for same ref"); 460 460 TEST(t_merged_refs(), "merged table with multiple updates to same ref"); 461 461 TEST(t_merged_seek_multiple_times(), "merged table can seek multiple times"); 462 - TEST(t_merged_single_record(), "ref ocurring in only one record can be fetched"); 462 + TEST(t_merged_single_record(), "ref occurring in only one record can be fetched"); 463 463 464 464 return test_done(); 465 465 }