{"thread":{"id":"59038","subject":"[PATCH] *: fix typos which duplicate a word","startedAt":"2023-01-06T13:13:12Z","lastAt":"2023-01-08T01:30:02Z","messageCount":5,"participants":["Andrei Rybak","Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"469832","messageId":"20230106131304.20779-1-rybak.a.v@gmail.com","threadId":"59038","inReplyTo":null,"subject":"[PATCH] *: fix typos which duplicate a word","fromName":"Andrei Rybak","fromEmail":"rybak.a.v@gmail.com","sentAt":"2023-01-06T13:13:04Z","receivedAt":"2023-01-06T13:13:12Z","isPatch":true,"sender":{"key":"rybak.a.v@gmail.com","avatar":"https://avatars.githubusercontent.com/u/624072?v=4"},"body":"Fix typos in code comments which repeat various words.  Most of the\ncases are simple in that they repeat a word that usually cannot be\nrepeated in a grammatically correct sentence.  Just remove the\nincorrectly duplicated word in these cases and rewrap text, if needed.\n\nA tricky case is usage of \"that that\", which is sometimes grammatically\ncorrect.  However, an instance of this in \"t7527-builtin-fsmonitor.sh\"\ndoesn't need two words \"that\", because there is only one daemon being\ndiscussed, so the word \"daemon\" does not need a determiner.\n\nReword code comment \"entries exist on on-disk index\" in function\nupdate_one in file cache-tree.c, by replacing incorrect preposition \"on\"\nwith \"in\".\n\nSigned-off-by: Andrei Rybak <rybak.a.v@gmail.com>\n---\n Documentation/gitprotocol-v2.txt | 2 +-\n builtin/checkout.c               | 2 +-\n builtin/submodule--helper.c      | 5 ++---\n cache-tree.c                     | 2 +-\n config.c                         | 2 +-\n run-command.c                    | 2 +-\n t/t4301-merge-tree-write-tree.sh | 4 ++--\n t/t6421-merge-partial-clone.sh   | 4 ++--\n t/t7527-builtin-fsmonitor.sh     | 4 ++--\n 9 files changed, 13 insertions(+), 14 deletions(-)\n\ndiff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt\nindex 10bd2d40ce..acb97ad0c2 100644\n--- a/Documentation/gitprotocol-v2.txt\n+++ b/Documentation/gitprotocol-v2.txt\n@@ -665,7 +665,7 @@ headers and their prerequisite relationships, or something else.\n +\n Server operators should feel confident in turning on \"bundle-uri\" and\n not worry if e.g. their CDN goes down that clones or fetches will run\n-into hard failures. Even if the server bundle bundle(s) are\n+into hard failures. Even if the server bundle(s) are\n incomplete, or bad in some way the client should still end up with a\n functioning repository, just as if it had chosen not to use this\n protocol extension.\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex cd04f0bf57..5963e1b74b 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -1270,7 +1270,7 @@ static int parse_branchname_arg(int argc, const char **argv,\n \t *       between A and B, A...B names that merge base.\n \t *\n \t *   (b) If <something> is _not_ a commit, either \"--\" is present\n-\t *       or <something> is not a path, no -t or -b was given, and\n+\t *       or <something> is not a path, no -t or -b was given,\n \t *       and there is a tracking branch whose name is <something>\n \t *       in one and only one remote (or if the branch exists on the\n \t *       remote named in checkout.defaultRemote), then this is a\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex 450680fc70..4c173d8b37 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -3219,9 +3219,8 @@ static void die_on_index_match(const char *path, int force)\n \t\tensure_full_index(&the_index);\n \n \t\t/*\n-\t\t * Since there is only one pathspec, we just need\n-\t\t * need to check ps_matched[0] to know if a cache\n-\t\t * entry matched.\n+\t\t * Since there is only one pathspec, we just need to\n+\t\t * check ps_matched[0] to know if a cache entry matched.\n \t\t */\n \t\tfor (i = 0; i < the_index.cache_nr; i++) {\n \t\t\tce_path_match(&the_index, the_index.cache[i], &ps,\ndiff --git a/cache-tree.c b/cache-tree.c\nindex c97111cccf..9af457f47c 100644\n--- a/cache-tree.c\n+++ b/cache-tree.c\n@@ -405,7 +405,7 @@ static int update_one(struct cache_tree *it,\n \t\t}\n \n \t\t/*\n-\t\t * CE_INTENT_TO_ADD entries exist on on-disk index but\n+\t\t * CE_INTENT_TO_ADD entries exist in on-disk index but\n \t\t * they are not part of generated trees. Invalidate up\n \t\t * to root to force cache-tree users to read elsewhere.\n \t\t */\ndiff --git a/config.c b/config.c\nindex 27f38283ad..00090a32fc 100644\n--- a/config.c\n+++ b/config.c\n@@ -3154,7 +3154,7 @@ int git_config_set_gently(const char *key, const char *value)\n int repo_config_set_worktree_gently(struct repository *r,\n \t\t\t\t    const char *key, const char *value)\n {\n-\t/* Only use worktree-specific config if it is is already enabled. */\n+\t/* Only use worktree-specific config if it is already enabled. */\n \tif (repository_format_worktree_config) {\n \t\tchar *file = repo_git_path(r, \"config.worktree\");\n \t\tint ret = git_config_set_multivar_in_file_gently(\ndiff --git a/run-command.c b/run-command.c\nindex 756f1839aa..50cc011654 100644\n--- a/run-command.c\n+++ b/run-command.c\n@@ -1853,7 +1853,7 @@ enum start_bg_result start_bg_command(struct child_process *cmd,\n \t\t *\n \t\t * We also assume that `start_command()` does not add\n \t\t * us to the cleanup list.  And that it calls\n-\t\t * calls `child_process_clear()`.\n+\t\t * `child_process_clear()`.\n \t\t */\n \t\tsbgr = SBGR_ERROR;\n \t\tgoto done;\ndiff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh\nindex a8983a0edc..250f721795 100755\n--- a/t/t4301-merge-tree-write-tree.sh\n+++ b/t/t4301-merge-tree-write-tree.sh\n@@ -141,7 +141,7 @@ test_expect_success 'test conflict notices and such' '\n #   Commit O: foo, olddir/{a,b,c}\n #   Commit A: modify foo, newdir/{a,b,c}\n #   Commit B: modify foo differently & rename foo -> olddir/bar\n-#   Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)\n+#   Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)\n \n test_expect_success 'directory rename + content conflict' '\n \t# Setup\n@@ -653,7 +653,7 @@ test_expect_success 'mod6: chains of rename/rename(1to2) and add/add via collidi\n #   Commit O: foo, olddir/{a,b,c}\n #   Commit A: delete foo, rename olddir/ -> newdir/, add newdir/bar/file\n #   Commit B: modify foo & rename foo -> olddir/bar\n-#   Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)\n+#   Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)\n \n test_expect_success 'directory rename + rename/delete + modify/delete + directory/file conflict' '\n \t# Setup\ndiff --git a/t/t6421-merge-partial-clone.sh b/t/t6421-merge-partial-clone.sh\nindex 5413e5dd9d..711b709e75 100755\n--- a/t/t6421-merge-partial-clone.sh\n+++ b/t/t6421-merge-partial-clone.sh\n@@ -155,7 +155,7 @@ test_setup_repo () {\n #   Commit A:\n #     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/\n #      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify\n-#      both both Makefiles and jumps)\n+#      both Makefiles and jumps)\n #              general/{jump1_A, jump2_A}\n #              basename/subdir/{numbers_A, sequence_A, values_A}\n #              folder/subdir/{a,b,c,d,Makefile_TOP_A}\n@@ -343,7 +343,7 @@ test_expect_merge_algorithm failure success 'Objects downloaded when a directory\n #   Commit A:\n #     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/\n #      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify\n-#      both both Makefiles and jumps)\n+#      both Makefiles and jumps)\n #              general/{jump1_A, jump2_A}\n #              basename/subdir/{numbers_A, sequence_A, values_A}\n #              folder/subdir/{a,b,c,d,Makefile_TOP_A}\ndiff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh\nindex 76d0220daa..f9aad19d1c 100755\n--- a/t/t7527-builtin-fsmonitor.sh\n+++ b/t/t7527-builtin-fsmonitor.sh\n@@ -904,7 +904,7 @@ test_expect_success \"submodule absorbgitdirs implicitly starts daemon\" '\n \n # On a case-insensitive file system, confirm that the daemon\n # notices when the .git directory is moved/renamed/deleted\n-# regardless of how it is spelled in the the FS event.\n+# regardless of how it is spelled in the FS event.\n # That is, does the FS event receive the spelling of the\n # operation or does it receive the spelling preserved with\n # the file/directory.\n@@ -922,7 +922,7 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '\n \ttest_path_is_dir test_insensitive/.git &&\n \ttest_path_is_dir test_insensitive/.GIT &&\n \n-\t# Rename .git using an alternate spelling to verify that that\n+\t# Rename .git using an alternate spelling to verify that\n \t# daemon detects it and automatically shuts down.\n \tmv test_insensitive/.GIT test_insensitive/.FOO &&\n \n-- \n2.38.1\n\n"},{"id":"469843","messageId":"CAPig+cTgUPWxMox_nSka52dML6_GHUUoY4HCtcq7+7J0oEyeNw@mail.gmail.com","threadId":"59038","inReplyTo":"20230106131304.20779-1-rybak.a.v@gmail.com","subject":"Re: [PATCH] *: fix typos which duplicate a word","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2023-01-06T18:25:11Z","receivedAt":"2023-01-06T18:25:28Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Fri, Jan 6, 2023 at 8:16 AM Andrei Rybak <rybak.a.v@gmail.com> wrote:\n> Fix typos in code comments which repeat various words.  Most of the\n> cases are simple in that they repeat a word that usually cannot be\n> repeated in a grammatically correct sentence.  Just remove the\n> incorrectly duplicated word in these cases and rewrap text, if needed.\n>\n> Reword code comment \"entries exist on on-disk index\" in function\n> update_one in file cache-tree.c, by replacing incorrect preposition \"on\"\n> with \"in\".\n\nThanks, these all look sensible.\n\n> A tricky case is usage of \"that that\", which is sometimes grammatically\n> correct.  However, an instance of this in \"t7527-builtin-fsmonitor.sh\"\n> doesn't need two words \"that\", because there is only one daemon being\n> discussed, so the word \"daemon\" does not need a determiner.\n\nBut...\n\n> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>\n> ---\n> diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh\n> @@ -922,7 +922,7 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '\n> -       # Rename .git using an alternate spelling to verify that that\n> +       # Rename .git using an alternate spelling to verify that\n>         # daemon detects it and automatically shuts down.\n>         mv test_insensitive/.GIT test_insensitive/.FOO &&\n\n... this doesn't read as well following the change. It would read well\nif you changed it to \"that the\".\n\nNot related to your patch at all, but I notice in this test that the\ncall to test_when_finished() is commented out:\n\n    # test_when_finished \"stop_daemon_delete_repo test_insensitive\" &&\n\nwhich makes me wonder if it was commented out while the test was being\ndebugged but then forgotten, and that the script is now potentially\nleaking a running daemon if something in the test fails after the\ndaemon was started, or if the daemon does not shut down on its own as\nit's supposed to do. [cc:+Jeff Hostetler]\n"},{"id":"469856","messageId":"xmqqr0w7qogp.fsf@gitster.g","threadId":"59038","inReplyTo":"20230106131304.20779-1-rybak.a.v@gmail.com","subject":"Re: [PATCH] *: fix typos which duplicate a word","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-01-06T22:37:26Z","receivedAt":"2023-01-06T22:37:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andrei Rybak <rybak.a.v@gmail.com> writes:\n\n> A tricky case is usage of \"that that\", which is sometimes grammatically\n> correct.  However, an instance of this in \"t7527-builtin-fsmonitor.sh\"\n> doesn't need two words \"that\", because there is only one daemon being\n> discussed, so the word \"daemon\" does not need a determiner.\n\nMakes me wonder if it is more appropriage to replace the second\n\"that\" with \"the\" there, then.\n\nOther than that, everything else in the patch looks good.\n"},{"id":"469881","messageId":"20230107135655.149892-1-rybak.a.v@gmail.com","threadId":"59038","inReplyTo":"CAPig+cTgUPWxMox_nSka52dML6_GHUUoY4HCtcq7+7J0oEyeNw@mail.gmail.com","subject":"[PATCH v2] *: fix typos which duplicate a word","fromName":"Andrei Rybak","fromEmail":"rybak.a.v@gmail.com","sentAt":"2023-01-07T13:56:55Z","receivedAt":"2023-01-07T13:59:08Z","isPatch":true,"sender":{"key":"rybak.a.v@gmail.com","avatar":"https://avatars.githubusercontent.com/u/624072?v=4"},"body":"Fix typos in code comments which repeat various words.  Most of the\ncases are simple in that they repeat a word that usually cannot be\nrepeated in a grammatically correct sentence.  Just remove the\nincorrectly duplicated word in these cases and rewrap text, if needed.\n\nA tricky case is usage of \"that that\", which is sometimes grammatically\ncorrect.  However, an instance of this in \"t7527-builtin-fsmonitor.sh\"\ndoesn't need two words \"that\", because there is only one daemon being\ndiscussed, so replace the second \"that\" with \"the\".\n\nReword code comment \"entries exist on on-disk index\" in function\nupdate_one in file cache-tree.c, by replacing incorrect preposition \"on\"\nwith \"in\".\n\nSigned-off-by: Andrei Rybak <rybak.a.v@gmail.com>\n---\n\nOn 2023-01-06T23:37, Junio C Hamano wrote:\n>> A tricky case is usage of \"that that\", which is sometimes grammatically\n>> correct.  However, an instance of this in \"t7527-builtin-fsmonitor.sh\"\n>> doesn't need two words \"that\", because there is only one daemon being\n>> discussed, so the word \"daemon\" does not need a determiner.\n> \n> Makes me wonder if it is more appropriage to replace the second\n> \"that\" with \"the\" there, then.\n\nOn 2023-01-06T19:25, Eric Sunshine wrote:\n> But...\n> \n>> ---\n>> diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh\n>> @@ -922,7 +922,7 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '\n>> -       # Rename .git using an alternate spelling to verify that that\n>> +       # Rename .git using an alternate spelling to verify that\n>>          # daemon detects it and automatically shuts down.\n>>          mv test_insensitive/.GIT test_insensitive/.FOO &&\n> \n> ... this doesn't read as well following the change. It would read well\n> if you changed it to \"that the\".\n\nHere's a v2 with \"that the\" and a corresponding update to the commit message.\n\n> Not related to your patch at all, but I notice in this test that the\n> call to test_when_finished() is commented out:\n> \n>      # test_when_finished \"stop_daemon_delete_repo test_insensitive\" &&\n> \n> which makes me wonder if it was commented out while the test was being\n> debugged but then forgotten, and that the script is now potentially\n> leaking a running daemon if something in the test fails after the\n> daemon was started, or if the daemon does not shut down on its own as\n> it's supposed to do. [cc:+Jeff Hostetler]\n\nAfter looking at this and other places from:\n\n    $ git grep -P '^\\s*#\\s*test_' -- 't/t[0-9]*'\n\nit seems that e.g. \"#test_expect_success\" in t/t9200-git-cvsexportcommit.sh,\ncould be replaced with test_expect_failure.  There are also more complicated\ncases like t/t6003-rev-list-topo-order.sh, where a helper function\n\"#test_output_expect_success\" from t/lib-t6000.sh is commented out, so a\ncorresponding `test_output_expect_failure` will be needed to uncomment the test.\n\n Documentation/gitprotocol-v2.txt | 2 +-\n builtin/checkout.c               | 2 +-\n builtin/submodule--helper.c      | 5 ++---\n cache-tree.c                     | 2 +-\n config.c                         | 2 +-\n run-command.c                    | 2 +-\n t/t4301-merge-tree-write-tree.sh | 4 ++--\n t/t6421-merge-partial-clone.sh   | 4 ++--\n t/t7527-builtin-fsmonitor.sh     | 6 +++---\n 9 files changed, 14 insertions(+), 15 deletions(-)\n\ndiff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt\nindex 10bd2d40ce..acb97ad0c2 100644\n--- a/Documentation/gitprotocol-v2.txt\n+++ b/Documentation/gitprotocol-v2.txt\n@@ -665,7 +665,7 @@ headers and their prerequisite relationships, or something else.\n +\n Server operators should feel confident in turning on \"bundle-uri\" and\n not worry if e.g. their CDN goes down that clones or fetches will run\n-into hard failures. Even if the server bundle bundle(s) are\n+into hard failures. Even if the server bundle(s) are\n incomplete, or bad in some way the client should still end up with a\n functioning repository, just as if it had chosen not to use this\n protocol extension.\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex cd04f0bf57..5963e1b74b 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -1270,7 +1270,7 @@ static int parse_branchname_arg(int argc, const char **argv,\n \t *       between A and B, A...B names that merge base.\n \t *\n \t *   (b) If <something> is _not_ a commit, either \"--\" is present\n-\t *       or <something> is not a path, no -t or -b was given, and\n+\t *       or <something> is not a path, no -t or -b was given,\n \t *       and there is a tracking branch whose name is <something>\n \t *       in one and only one remote (or if the branch exists on the\n \t *       remote named in checkout.defaultRemote), then this is a\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex 450680fc70..4c173d8b37 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -3219,9 +3219,8 @@ static void die_on_index_match(const char *path, int force)\n \t\tensure_full_index(&the_index);\n \n \t\t/*\n-\t\t * Since there is only one pathspec, we just need\n-\t\t * need to check ps_matched[0] to know if a cache\n-\t\t * entry matched.\n+\t\t * Since there is only one pathspec, we just need to\n+\t\t * check ps_matched[0] to know if a cache entry matched.\n \t\t */\n \t\tfor (i = 0; i < the_index.cache_nr; i++) {\n \t\t\tce_path_match(&the_index, the_index.cache[i], &ps,\ndiff --git a/cache-tree.c b/cache-tree.c\nindex c97111cccf..9af457f47c 100644\n--- a/cache-tree.c\n+++ b/cache-tree.c\n@@ -405,7 +405,7 @@ static int update_one(struct cache_tree *it,\n \t\t}\n \n \t\t/*\n-\t\t * CE_INTENT_TO_ADD entries exist on on-disk index but\n+\t\t * CE_INTENT_TO_ADD entries exist in on-disk index but\n \t\t * they are not part of generated trees. Invalidate up\n \t\t * to root to force cache-tree users to read elsewhere.\n \t\t */\ndiff --git a/config.c b/config.c\nindex 27f38283ad..00090a32fc 100644\n--- a/config.c\n+++ b/config.c\n@@ -3154,7 +3154,7 @@ int git_config_set_gently(const char *key, const char *value)\n int repo_config_set_worktree_gently(struct repository *r,\n \t\t\t\t    const char *key, const char *value)\n {\n-\t/* Only use worktree-specific config if it is is already enabled. */\n+\t/* Only use worktree-specific config if it is already enabled. */\n \tif (repository_format_worktree_config) {\n \t\tchar *file = repo_git_path(r, \"config.worktree\");\n \t\tint ret = git_config_set_multivar_in_file_gently(\ndiff --git a/run-command.c b/run-command.c\nindex 756f1839aa..50cc011654 100644\n--- a/run-command.c\n+++ b/run-command.c\n@@ -1853,7 +1853,7 @@ enum start_bg_result start_bg_command(struct child_process *cmd,\n \t\t *\n \t\t * We also assume that `start_command()` does not add\n \t\t * us to the cleanup list.  And that it calls\n-\t\t * calls `child_process_clear()`.\n+\t\t * `child_process_clear()`.\n \t\t */\n \t\tsbgr = SBGR_ERROR;\n \t\tgoto done;\ndiff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh\nindex a8983a0edc..250f721795 100755\n--- a/t/t4301-merge-tree-write-tree.sh\n+++ b/t/t4301-merge-tree-write-tree.sh\n@@ -141,7 +141,7 @@ test_expect_success 'test conflict notices and such' '\n #   Commit O: foo, olddir/{a,b,c}\n #   Commit A: modify foo, newdir/{a,b,c}\n #   Commit B: modify foo differently & rename foo -> olddir/bar\n-#   Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)\n+#   Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)\n \n test_expect_success 'directory rename + content conflict' '\n \t# Setup\n@@ -653,7 +653,7 @@ test_expect_success 'mod6: chains of rename/rename(1to2) and add/add via collidi\n #   Commit O: foo, olddir/{a,b,c}\n #   Commit A: delete foo, rename olddir/ -> newdir/, add newdir/bar/file\n #   Commit B: modify foo & rename foo -> olddir/bar\n-#   Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)\n+#   Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)\n \n test_expect_success 'directory rename + rename/delete + modify/delete + directory/file conflict' '\n \t# Setup\ndiff --git a/t/t6421-merge-partial-clone.sh b/t/t6421-merge-partial-clone.sh\nindex 5413e5dd9d..711b709e75 100755\n--- a/t/t6421-merge-partial-clone.sh\n+++ b/t/t6421-merge-partial-clone.sh\n@@ -155,7 +155,7 @@ test_setup_repo () {\n #   Commit A:\n #     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/\n #      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify\n-#      both both Makefiles and jumps)\n+#      both Makefiles and jumps)\n #              general/{jump1_A, jump2_A}\n #              basename/subdir/{numbers_A, sequence_A, values_A}\n #              folder/subdir/{a,b,c,d,Makefile_TOP_A}\n@@ -343,7 +343,7 @@ test_expect_merge_algorithm failure success 'Objects downloaded when a directory\n #   Commit A:\n #     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/\n #      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify\n-#      both both Makefiles and jumps)\n+#      both Makefiles and jumps)\n #              general/{jump1_A, jump2_A}\n #              basename/subdir/{numbers_A, sequence_A, values_A}\n #              folder/subdir/{a,b,c,d,Makefile_TOP_A}\ndiff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh\nindex 76d0220daa..c2582d44a6 100755\n--- a/t/t7527-builtin-fsmonitor.sh\n+++ b/t/t7527-builtin-fsmonitor.sh\n@@ -904,7 +904,7 @@ test_expect_success \"submodule absorbgitdirs implicitly starts daemon\" '\n \n # On a case-insensitive file system, confirm that the daemon\n # notices when the .git directory is moved/renamed/deleted\n-# regardless of how it is spelled in the the FS event.\n+# regardless of how it is spelled in the FS event.\n # That is, does the FS event receive the spelling of the\n # operation or does it receive the spelling preserved with\n # the file/directory.\n@@ -922,8 +922,8 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '\n \ttest_path_is_dir test_insensitive/.git &&\n \ttest_path_is_dir test_insensitive/.GIT &&\n \n-\t# Rename .git using an alternate spelling to verify that that\n-\t# daemon detects it and automatically shuts down.\n+\t# Rename .git using an alternate spelling to verify that\n+\t# the daemon detects it and automatically shuts down.\n \tmv test_insensitive/.GIT test_insensitive/.FOO &&\n \n \t# See [1] above.\n-- \n2.38.1\n\n"},{"id":"469897","messageId":"xmqqlemd24q3.fsf@gitster.g","threadId":"59038","inReplyTo":"20230107135655.149892-1-rybak.a.v@gmail.com","subject":"Re: [PATCH v2] *: fix typos which duplicate a word","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-01-08T01:29:56Z","receivedAt":"2023-01-08T01:30:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andrei Rybak <rybak.a.v@gmail.com> writes:\n\n> Here's a v2 with \"that the\" and a corresponding update to the commit message.\n\nLooks good.  Will queue.  Thanks.\n"}]}