git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Andrei Rybak <rybak.a.v@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] fix typos which duplicate a word
Date: Wed, 9 Jun 2021 11:28:44 -0400	[thread overview]
Message-ID: <CAPig+cTjjNrU9q8UPm+CRuTKq8_XNc+1z7-3F4bvetBi+NjKeQ@mail.gmail.com> (raw)
In-Reply-To: <20210609102641.3531183-1-rybak.a.v@gmail.com>

On Wed, Jun 9, 2021 at 6:27 AM Andrei Rybak <rybak.a.v@gmail.com> wrote:
> Fix typos in documentation and code comments which repeat various words.
> These typos were found by searching using scripts like this:
> [...]
> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
> ---
> diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
> @@ -871,7 +871,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
>  # 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

All the other fixes for duplicate words look "obviously correct", but
in this case, the duplicate "that that" is likely intentional and
grammatically sensible, so perhaps drop this hunk from the patch?

  reply	other threads:[~2021-06-09 15:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09 10:26 [PATCH] fix typos which duplicate a word Andrei Rybak
2021-06-09 15:28 ` Eric Sunshine [this message]
2021-06-09 17:31 ` Felipe Contreras
2021-06-10  7:24 ` [PATCH v2] *: " Andrei Rybak
2021-06-10 14:46   ` Felipe Contreras
2021-06-10 23:59   ` Junio C Hamano
2021-06-11  9:31     ` Andrei Rybak
2021-06-11 11:18 ` [PATCH v3] " Andrei Rybak
2021-06-14  1:11   ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2023-01-06 13:13 [PATCH] " Andrei Rybak
2023-01-06 18:25 ` Eric Sunshine
2023-01-06 22:37 ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=CAPig+cTjjNrU9q8UPm+CRuTKq8_XNc+1z7-3F4bvetBi+NjKeQ@mail.gmail.com \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=rybak.a.v@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).