On Fri, Jan 6, 2023 at 8:16 AM Andrei Rybak <rybak.a.v@xxxxxxxxx> wrote:
> Fix typos in code comments which repeat various words. Most of the
> cases are simple in that they repeat a word that usually cannot be
> repeated in a grammatically correct sentence. Just remove the
> incorrectly duplicated word in these cases and rewrap text, if needed.
>
> Reword code comment "entries exist on on-disk index" in function
> update_one in file cache-tree.c, by replacing incorrect preposition "on"
> with "in".
Thanks, these all look sensible.
> A tricky case is usage of "that that", which is sometimes grammatically
> correct. However, an instance of this in "t7527-builtin-fsmonitor.sh"
> doesn't need two words "that", because there is only one daemon being
> discussed, so the word "daemon" does not need a determiner.
But...
> Signed-off-by: Andrei Rybak <rybak.a.v@xxxxxxxxx>
> ---
> diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
> @@ -922,7 +922,7 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '
> - # Rename .git using an alternate spelling to verify that that
> + # Rename .git using an alternate spelling to verify that
> # daemon detects it and automatically shuts down.
> mv test_insensitive/.GIT test_insensitive/.FOO &&
... this doesn't read as well following the change. It would read well
if you changed it to "that the".
Not related to your patch at all, but I notice in this test that the
call to test_when_finished() is commented out:
# test_when_finished "stop_daemon_delete_repo test_insensitive" &&
which makes me wonder if it was commented out while the test was being
debugged but then forgotten, and that the script is now potentially
leaking a running daemon if something in the test fails after the
daemon was started, or if the daemon does not shut down on its own as
it's supposed to do. [cc:+Jeff Hostetler]
