{"thread":{"id":"62303","subject":"[PATCH v2 0/7] Fix typos","startedAt":"2024-10-10T15:12:44Z","lastAt":"2024-10-15T00:35:09Z","messageCount":10,"participants":["Andrew Kreimer","Patrick Steinhardt","Taylor Blau"],"isPatch":true,"patchVersion":2,"patchTotal":7},"messages":[{"id":"504699","messageId":"20241010151223.311719-1-algonell@gmail.com","threadId":"62303","inReplyTo":null,"subject":"[PATCH v2 0/7] Fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:18Z","receivedAt":"2024-10-10T15:12:44Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"v2:\n  - Fix grammar.\n\nv1:\n  - https://lore.kernel.org/all/20241009114940.520486-1-algonell@gmail.com/\n\nInterdiff against v1:\ndiff --git a/compat/regex/regexec.c b/compat/regex/regexec.c\nindex 15ab2d1d40..2eeec82f40 100644\n--- a/compat/regex/regexec.c\n+++ b/compat/regex/regexec.c\n@@ -292,7 +292,7 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);\n    concerned.\n \n    If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match\n-   and all groups is stored in REGS.  (For the \"_2\" variants, the offsets are\n+   and all groups are stored in REGS.  (For the \"_2\" variants, the offsets are\n    computed relative to the concatenation, not relative to the individual\n    strings.)\n \n-- \n2.43.0\n\n"},{"id":"504700","messageId":"20241010151223.311719-2-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 1/7] compat: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:19Z","receivedAt":"2024-10-10T15:12:44Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos and grammar.\n\nReported-by: Patrick Steinhardt <ps@pks.im>\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n compat/fsmonitor/fsm-listen-win32.c | 4 ++--\n compat/regex/regexec.c              | 2 +-\n compat/simple-ipc/ipc-unix-socket.c | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c\nindex 5a21dade7b..e24d312f30 100644\n--- a/compat/fsmonitor/fsm-listen-win32.c\n+++ b/compat/fsmonitor/fsm-listen-win32.c\n@@ -431,9 +431,9 @@ static int recv_rdcw_watch(struct one_watch *watch)\n \t * but I observed ERROR_ACCESS_DENIED (0x05) errors during\n \t * testing.\n \t *\n-\t * Note that we only get notificaiton events for events\n+\t * Note that we only get notification events for events\n \t * *within* the directory, not *on* the directory itself.\n-\t * (These might be properies of the parent directory, for\n+\t * (These might be properties of the parent directory, for\n \t * example).\n \t *\n \t * NEEDSWORK: We might try to check for the deleted directory\ndiff --git a/compat/regex/regexec.c b/compat/regex/regexec.c\nindex e92be5741d..2eeec82f40 100644\n--- a/compat/regex/regexec.c\n+++ b/compat/regex/regexec.c\n@@ -292,7 +292,7 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);\n    concerned.\n \n    If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match\n-   and all groups is stroed in REGS.  (For the \"_2\" variants, the offsets are\n+   and all groups are stored in REGS.  (For the \"_2\" variants, the offsets are\n    computed relative to the concatenation, not relative to the individual\n    strings.)\n \ndiff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c\nindex 9b3f2cdf8c..fe8d3fe1eb 100644\n--- a/compat/simple-ipc/ipc-unix-socket.c\n+++ b/compat/simple-ipc/ipc-unix-socket.c\n@@ -712,7 +712,7 @@ static int accept_thread__wait_for_connection(\n  * Block SIGPIPE in this thread for the life of the thread.  This\n  * avoids any stray SIGPIPE signals when closing pipe fds under\n  * extremely heavy loads (such as when the fifo queue is full and we\n- * drop incomming connections).\n+ * drop incoming connections).\n  */\n static void *accept_thread_proc(void *_accept_thread_data)\n {\n-- \n2.43.0\n\n"},{"id":"504701","messageId":"20241010151223.311719-3-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 2/7] contrib: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:20Z","receivedAt":"2024-10-10T15:12:45Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos via codespell.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n contrib/completion/git-completion.bash | 4 ++--\n contrib/subtree/git-subtree.sh         | 2 +-\n contrib/subtree/t/t7900-subtree.sh     | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 60a22d619a..3d4dff3185 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -3296,7 +3296,7 @@ __gitcomp_directories ()\n \t\t#       i.e. which are *already* part of their\n \t\t#       sparse-checkout.  Thus, normal file and directory\n \t\t#       completion is always useless for \"git\n-\t\t#       sparse-checkout add\" and is also probelmatic for\n+\t\t#       sparse-checkout add\" and is also problematic for\n \t\t#       \"git sparse-checkout set\" unless using it to\n \t\t#       strictly narrow the checkout.\n \t\tCOMPREPLY=( \"\" )\n@@ -3698,7 +3698,7 @@ _git_worktree ()\n \t\t# Here we are not completing an --option, it's either the\n \t\t# path or a ref.\n \t\tcase \"$prev\" in\n-\t\t-b|-B)\t# Complete refs for branch to be created/reseted.\n+\t\t-b|-B)\t# Complete refs for branch to be created/reset.\n \t\t\t__git_complete_refs\n \t\t\t;;\n \t\t-*)\t# The previous word is an -o|--option without an\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex 5dab3f506c..15ae86db1b 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -946,7 +946,7 @@ cmd_split () {\n \t\trev=$(git rev-parse -q --verify \"$1^{commit}\") ||\n \t\t\tdie \"fatal: '$1' does not refer to a commit\"\n \telse\n-\t\tdie \"fatal: you must provide exactly one revision, and optionnally a repository.  Got: '$*'\"\n+\t\tdie \"fatal: you must provide exactly one revision, and optionally a repository.  Got: '$*'\"\n \tfi\n \trepository=\"\"\n \tif test \"$#\" = 2\ndiff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh\nindex c3bd2a58b9..3c6103f6d2 100755\n--- a/contrib/subtree/t/t7900-subtree.sh\n+++ b/contrib/subtree/t/t7900-subtree.sh\n@@ -47,7 +47,7 @@ last_commit_subject () {\n # pre-2.32.0 versions of 'git subtree' would write the hash of the tag\n # (sub1 below), instead of the commit (sub1^{commit}) in the\n # \"git-subtree-split\" trailer.\n-# We immitate this behaviour below using a replace ref.\n+# We imitate this behaviour below using a replace ref.\n # This function creates 3 repositories:\n # - $1\n # - $1-sub (added as subtree \"sub\" in $1)\n-- \n2.43.0\n\n"},{"id":"504702","messageId":"20241010151223.311719-4-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 3/7] git-gui: Fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:21Z","receivedAt":"2024-10-10T15:12:46Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos via codespell.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n git-gui/lib/status_bar.tcl | 2 +-\n git-gui/lib/themed.tcl     | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-gui/lib/status_bar.tcl b/git-gui/lib/status_bar.tcl\nindex d32b14142f..a680452524 100644\n--- a/git-gui/lib/status_bar.tcl\n+++ b/git-gui/lib/status_bar.tcl\n@@ -216,7 +216,7 @@ method _delete {current} {\n # activity, with the context that there are a few situations where multiple\n # overlapping asynchronous operations might want to display status information\n # simultaneously. Instances of status_bar_operation are created by calling\n-# start on the status_bar, and when the caller is done with its stauts bar\n+# start on the status_bar, and when the caller is done with its status bar\n # operation, it calls stop on the operation.\n \n class status_bar_operation {\ndiff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl\nindex f43d84e54f..68c999a9be 100644\n--- a/git-gui/lib/themed.tcl\n+++ b/git-gui/lib/themed.tcl\n@@ -4,7 +4,7 @@\n \n namespace eval color {\n \t# Variable colors\n-\t# Preffered way to set widget colors is using add_option.\n+\t# Preferred way to set widget colors is using add_option.\n \t# In some cases, like with tags in_diff/in_sel, we use these colors.\n \tvariable select_bg\t\t\t\tlightgray\n \tvariable select_fg\t\t\t\tblack\n-- \n2.43.0\n\n"},{"id":"504703","messageId":"20241010151223.311719-5-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 4/7] t: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:22Z","receivedAt":"2024-10-10T15:12:46Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos via codespell.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n t/lib-bundle.sh          | 2 +-\n t/lib-rebase.sh          | 2 +-\n t/lib-sudo.sh            | 2 +-\n t/lib-unicode-nfc-nfd.sh | 2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/lib-bundle.sh b/t/lib-bundle.sh\nindex cf7ed818b2..62b7bb13c8 100644\n--- a/t/lib-bundle.sh\n+++ b/t/lib-bundle.sh\n@@ -11,7 +11,7 @@ convert_bundle_to_pack () {\n }\n \n # Check count of objects in a bundle file.\n-# We can use \"--thin\" opiton to check thin pack, which must be fixed by\n+# We can use \"--thin\" option to check thin pack, which must be fixed by\n # command `git-index-pack --fix-thin --stdin`.\n test_bundle_object_count () {\n \tthin=\ndiff --git a/t/lib-rebase.sh b/t/lib-rebase.sh\nindex 11d2dc9fe3..0dd764310d 100644\n--- a/t/lib-rebase.sh\n+++ b/t/lib-rebase.sh\n@@ -187,7 +187,7 @@ set_reword_editor () {\n \t\t\texit 1\n \t\tfi\n \tfi &&\n-\t# There should be no uncommited changes\n+\t# There should be no uncommitted changes\n \tgit diff --exit-code HEAD &&\n \t# The todo-list should be re-read after a reword\n \tGIT_SEQUENCE_EDITOR=\"\\\"$PWD/reword-sequence-editor.sh\\\"\" \\\ndiff --git a/t/lib-sudo.sh b/t/lib-sudo.sh\nindex b4d7788f4e..477e0fdc04 100644\n--- a/t/lib-sudo.sh\n+++ b/t/lib-sudo.sh\n@@ -6,7 +6,7 @@ run_with_sudo () {\n \tlocal RUN=\"$TEST_DIRECTORY/$$.sh\"\n \twrite_script \"$RUN\" \"$TEST_SHELL_PATH\"\n \t# avoid calling \"$RUN\" directly so sudo doesn't get a chance to\n-\t# override the shell, add aditional restrictions or even reject\n+\t# override the shell, add additional restrictions or even reject\n \t# running the script because its security policy deem it unsafe\n \tsudo \"$TEST_SHELL_PATH\" -c \"\\\"$RUN\\\"\"\n \tret=$?\ndiff --git a/t/lib-unicode-nfc-nfd.sh b/t/lib-unicode-nfc-nfd.sh\nindex 22232247ef..aed0a4dd44 100755\n--- a/t/lib-unicode-nfc-nfd.sh\n+++ b/t/lib-unicode-nfc-nfd.sh\n@@ -74,7 +74,7 @@ test_lazy_prereq UNICODE_NFD_PRESERVED '\n # Yielding:   \\xcf \\x89  +  \\xcc \\x94  +  \\xcd \\x82\n #\n # Note that I've used the canonical ordering of the\n-# combinining characters.  It is also possible to\n+# combining characters.  It is also possible to\n # swap them.  My testing shows that that non-standard\n # ordering also causes a collision in mkdir.  However,\n # the resulting names don't draw correctly on the\n-- \n2.43.0\n\n"},{"id":"504704","messageId":"20241010151223.311719-7-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 6/7] t/unit-tests: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:24Z","receivedAt":"2024-10-10T15:12:47Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos via codespell.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n t/unit-tests/t-reftable-basics.c | 2 +-\n t/unit-tests/t-reftable-merged.c | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/unit-tests/t-reftable-basics.c b/t/unit-tests/t-reftable-basics.c\nindex e5556ebf52..a9a9f888a4 100644\n--- a/t/unit-tests/t-reftable-basics.c\n+++ b/t/unit-tests/t-reftable-basics.c\n@@ -54,7 +54,7 @@ int cmd_main(int argc UNUSED, const char *argv[] UNUSED)\n \t\t}\n \t}\n \n-\tif_test (\"names_length retuns size of a NULL-terminated string array\") {\n+\tif_test (\"names_length returns size of a NULL-terminated string array\") {\n \t\tconst char *a[] = { \"a\", \"b\", NULL };\n \t\tcheck_int(names_length(a), ==, 2);\n \t}\ndiff --git a/t/unit-tests/t-reftable-merged.c b/t/unit-tests/t-reftable-merged.c\nindex 19e54bdfb8..109d3b07a7 100644\n--- a/t/unit-tests/t-reftable-merged.c\n+++ b/t/unit-tests/t-reftable-merged.c\n@@ -459,7 +459,7 @@ int cmd_main(int argc UNUSED, const char *argv[] UNUSED)\n \tTEST(t_merged_logs(), \"merged table with multiple log updates for same ref\");\n \tTEST(t_merged_refs(), \"merged table with multiple updates to same ref\");\n \tTEST(t_merged_seek_multiple_times(), \"merged table can seek multiple times\");\n-\tTEST(t_merged_single_record(), \"ref ocurring in only one record can be fetched\");\n+\tTEST(t_merged_single_record(), \"ref occurring in only one record can be fetched\");\n \n \treturn test_done();\n }\n-- \n2.43.0\n\n"},{"id":"504705","messageId":"20241010151223.311719-6-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 5/7] t/perf: fix typos","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:23Z","receivedAt":"2024-10-10T15:12:47Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix typos via codespell.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n t/perf/p7527-builtin-fsmonitor.sh | 2 +-\n t/perf/perf-lib.sh                | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/perf/p7527-builtin-fsmonitor.sh b/t/perf/p7527-builtin-fsmonitor.sh\nindex c3f9a4caa4..90164327e8 100755\n--- a/t/perf/p7527-builtin-fsmonitor.sh\n+++ b/t/perf/p7527-builtin-fsmonitor.sh\n@@ -95,7 +95,7 @@ test_expect_success \"Setup borrowed repo (fsm+uc)\" \"\n # time is not useful.\n #\n # Create a temp branch and do all work relative to it so that we don't\n-# accidentially alter the real ballast branch.\n+# accidentally alter the real ballast branch.\n #\n test_expect_success \"Setup borrowed repo (temp ballast branch)\" \"\n \ttest_might_fail git -C $REPO checkout $BALLAST_BR &&\ndiff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh\nindex ab0c763411..8ab6d9c469 100644\n--- a/t/perf/perf-lib.sh\n+++ b/t/perf/perf-lib.sh\n@@ -282,7 +282,7 @@ test_perf_ () {\n #\tRun the performance test script specified in perf-test with\n #\toptional prerequisite and setup steps.\n # Options:\n-#\t--prereq prerequisites: Skip the test if prequisites aren't met\n+#\t--prereq prerequisites: Skip the test if prerequisites aren't met\n #\t--setup \"setup-steps\": Run setup steps prior to each measured iteration\n #\n test_perf () {\n@@ -309,7 +309,7 @@ test_size_ () {\n #\tprerequisites and setup steps. Returns the numeric value\n #\treturned by size-test.\n # Options:\n-#\t--prereq prerequisites: Skip the test if prequisites aren't met\n+#\t--prereq prerequisites: Skip the test if prerequisites aren't met\n #\t--setup \"setup-steps\": Run setup steps prior to the size measurement\n \n test_size () {\n-- \n2.43.0\n\n"},{"id":"504706","messageId":"20241010151223.311719-8-algonell@gmail.com","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"[PATCH v2 7/7] t/helper: fix a typo","fromName":"Andrew Kreimer","fromEmail":"algonell@gmail.com","sentAt":"2024-10-10T15:11:25Z","receivedAt":"2024-10-10T15:12:48Z","isPatch":true,"sender":{"key":"algonell@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4669001?v=4"},"body":"Fix a typo in comments: bellow -> below.\n\nSigned-off-by: Andrew Kreimer <algonell@gmail.com>\n---\n t/helper/test-rot13-filter.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/helper/test-rot13-filter.c b/t/helper/test-rot13-filter.c\nindex 7e1d9e0ee4..ff407b575c 100644\n--- a/t/helper/test-rot13-filter.c\n+++ b/t/helper/test-rot13-filter.c\n@@ -9,7 +9,7 @@\n  * (\"clean\", \"smudge\", etc).\n  *\n  * When --always-delay is given all pathnames with the \"can-delay\" flag\n- * that don't appear on the list bellow are delayed with a count of 1\n+ * that don't appear on the list below are delayed with a count of 1\n  * (see more below).\n  *\n  * This implementation supports special test cases:\n-- \n2.43.0\n\n"},{"id":"504980","messageId":"Zwz05AIAGLOu_EdD@pks.im","threadId":"62303","inReplyTo":"20241010151223.311719-1-algonell@gmail.com","subject":"Re: [PATCH v2 0/7] Fix typos","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2024-10-14T10:39:38Z","receivedAt":"2024-10-14T10:39:43Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Thu, Oct 10, 2024 at 06:11:18PM +0300, Andrew Kreimer wrote:\n> v2:\n>   - Fix grammar.\n> \n> v1:\n>   - https://lore.kernel.org/all/20241009114940.520486-1-algonell@gmail.com/\n> \n> Interdiff against v1:\n> diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c\n> index 15ab2d1d40..2eeec82f40 100644\n> --- a/compat/regex/regexec.c\n> +++ b/compat/regex/regexec.c\n> @@ -292,7 +292,7 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);\n>     concerned.\n>  \n>     If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match\n> -   and all groups is stored in REGS.  (For the \"_2\" variants, the offsets are\n> +   and all groups are stored in REGS.  (For the \"_2\" variants, the offsets are\n>     computed relative to the concatenation, not relative to the individual\n>     strings.)\n\nThanks, the diff compared to v1 looks as expected to me, so this version\nis good to go from my point of view.\n\nPatrick\n"},{"id":"505104","messageId":"Zw24ul77FO8fPhAs@nand.local","threadId":"62303","inReplyTo":"Zwz05AIAGLOu_EdD@pks.im","subject":"Re: [PATCH v2 0/7] Fix typos","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2024-10-15T00:35:06Z","receivedAt":"2024-10-15T00:35:09Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Mon, Oct 14, 2024 at 12:39:38PM +0200, Patrick Steinhardt wrote:\n> Thanks, the diff compared to v1 looks as expected to me, so this\n> version is good to go from my point of view.\n\nThanks very much for reviewing.\n\nThanks,\nTaylor\n"}]}