public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Siddharth Shrimali <r.siddharth.shrimali@gmail.com>
Cc: git@vger.kernel.org,  algonell@gmail.com,  jeffhost@microsoft.com
Subject: Re: [PATCH] t: fix "that that" typos in test comments
Date: Mon, 02 Mar 2026 10:46:29 -0800	[thread overview]
Message-ID: <xmqqfr6i133u.fsf@gitster.g> (raw)
In-Reply-To: <20260302164521.79148-1-r.siddharth.shrimali@gmail.com> (Siddharth Shrimali's message of "Mon, 2 Mar 2026 22:15:21 +0530")

Siddharth Shrimali <r.siddharth.shrimali@gmail.com> writes:

> diff --git a/t/lib-unicode-nfc-nfd.sh b/t/lib-unicode-nfc-nfd.sh
> index aed0a4dd44..201ab9b24c 100755
> --- a/t/lib-unicode-nfc-nfd.sh
> +++ b/t/lib-unicode-nfc-nfd.sh
> @@ -75,7 +75,7 @@ test_lazy_prereq UNICODE_NFD_PRESERVED '
>  #
>  # Note that I've used the canonical ordering of the
>  # combining characters.  It is also possible to
> -# swap them.  My testing shows that that non-standard
> +# swap them.  My testing shows that non-standard
>  # ordering also causes a collision in mkdir.  However,

While the original in this hunk clearly has unwanted "that" there
and removing it is unambiguously the single right thing to do here,
...

>  # As a sanity check, ask Perl to parse our generated JSON and recursively
> -# dump the resulting data in sorted order.  Confirm that that matches our
> +# dump the resulting data in sorted order.  Confirm that it matches our
>  # expectations.

... this does not fall into the same category, does it?  The
phrasing may be a bit awkward, but it is not factually or
gramatically wrong per-se.

I think the next one also falls into the same category as this one.
In fact, referring to that one arbitrary path chosen in the previous
step as "that arbitrary path" (i.e., the original) may convey the
intent more cleanly than the updated one "the arbitrary path".

> diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
> index ed20de8ea2..63de0fc6cb 100755
> --- a/t/t6416-recursive-corner-cases.sh
> +++ b/t/t6416-recursive-corner-cases.sh
> @@ -775,7 +775,7 @@ test_expect_failure 'merge of D2 & E4 merges a2s & reports conflict for a/file'
>  # it feels sound to say "B and C do not agree what the final pathname
>  # should be, but we know this content was derived from the common A:a so we
>  # use one path whose name is arbitrary in the virtual merge base X between
> -# D and E" and then further let the rename detection to notice that that
> +# D and E" and then further let the rename detection to notice that the
>  # arbitrary path gets renamed between X-D to "newname" and X-E also to
>  # "newname" to resolve it as both sides renaming it to the same new
>  # name. It is akin to what we do at the content level, i.e. "B and C do not

  parent reply	other threads:[~2026-03-02 18:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-02 16:45 [PATCH] t: fix "that that" typos in test comments Siddharth Shrimali
2026-03-02 17:00 ` Siddharth Shrimali
2026-03-02 18:46 ` Junio C Hamano [this message]
2026-03-02 19:26 ` [PATCH v2] t: fix "that that" typo in lib-unicode-nfc-nfd.sh Siddharth Shrimali
2026-03-02 21:43   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqfr6i133u.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=algonell@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jeffhost@microsoft.com \
    --cc=r.siddharth.shrimali@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox