threads / patch / 47786

patchdocs/interpret-trailers: fix agreement error

Subject: [PATCH] docs/interpret-trailers: fix agreement error

## tl;dr

6 messages between Feb 8, 2018 and Feb 13, 2018. Diffs are folded; open one to read it.

replies: 5people: 3as markdown or json

brian m. carlson· Feb 8, 2018, 02:56 UTC · lore

In the description of git interpret-trailers, we describe "a group…of lines" that have certain characteristics. Because the first option uses a plural verb (referring to "lines"), the second option must also use plural verbs for parallelism.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
I'm somewhat on the fence about this patch.  To me, the number
disagreement is very jarring.  However, I'm also sympathetic to the fact
that the latter sentence reads more naturally in the singular.

Opinions on improvements welcome.

 Documentation/git-interpret-trailers.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to Documentation/git-interpret-trailers.txt +2 −2

diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 9dd19a1dd9..de5011e564 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -51,8 +51,8 @@ with only spaces at the end of the commit message part, one blank line
 will be added before the new trailer.
 
 Existing trailers are extracted from the input message by looking for
-a group of one or more lines that (i) are all trailers, or (ii) contains at
-least one Git-generated or user-configured trailer and consists of at
+a group of one or more lines that (i) are all trailers, or (ii) contain at
+least one Git-generated or user-configured trailer and consist of at
 least 25% trailers.
 The group must be preceded by one or more empty (or whitespace-only) lines.
 The group must either be at the end of the message or be the last

Jonathan Tan· Feb 8, 2018, 18:13 UTC · re: brian m. carlson · lore

Re: [PATCH] docs/interpret-trailers: fix agreement error

On Thu, 8 Feb 2018 02:56:14 +0000 "brian m. carlson" <sandals@crustytoothpaste.net> wrote:

Show 8 quoted lines

>  Existing trailers are extracted from the input message by looking for
> -a group of one or more lines that (i) are all trailers, or (ii) contains at
> -least one Git-generated or user-configured trailer and consists of at
> +a group of one or more lines that (i) are all trailers, or (ii) contain at
> +least one Git-generated or user-configured trailer and consist of at
>  least 25% trailers.
>  The group must be preceded by one or more empty (or whitespace-only) lines.
>  The group must either be at the end of the message or be the last

Ah, good catch. Maybe "a group of one or more lines that (i) consists of all trailers, or (ii) contains ..."?

I'm also OK with the patch as-is.

Junio C Hamano· Feb 8, 2018, 20:29 UTC · re: Jonathan Tan · lore

Re: [PATCH] docs/interpret-trailers: fix agreement error

Jonathan Tan <jonathantanmy@google.com> writes:

Show 14 quoted lines

> On Thu,  8 Feb 2018 02:56:14 +0000
> "brian m. carlson" <sandals@crustytoothpaste.net> wrote:
>
>>  Existing trailers are extracted from the input message by looking for
>> -a group of one or more lines that (i) are all trailers, or (ii) contains at
>> -least one Git-generated or user-configured trailer and consists of at
>> +a group of one or more lines that (i) are all trailers, or (ii) contain at
>> +least one Git-generated or user-configured trailer and consist of at
>>  least 25% trailers.
>>  The group must be preceded by one or more empty (or whitespace-only) lines.
>>  The group must either be at the end of the message or be the last
>
> Ah, good catch. Maybe "a group of one or more lines that (i) consists of all
> trailers, or (ii) contains ..."?

Your version reads better perhaps because it talks about "a group" without placing undue stress on the fact that the member of the group are usually multiple---I guess it is better over Brian's?

brian m. carlson· Feb 10, 2018, 16:57 UTC · re: Junio C Hamano · lore

Re: [PATCH] docs/interpret-trailers: fix agreement error

On Thu, Feb 08, 2018 at 12:29:53PM -0800, Junio C Hamano wrote:

Show 20 quoted lines

> Jonathan Tan <jonathantanmy@google.com> writes:
> 
> > On Thu,  8 Feb 2018 02:56:14 +0000
> > "brian m. carlson" <sandals@crustytoothpaste.net> wrote:
> >
> >>  Existing trailers are extracted from the input message by looking for
> >> -a group of one or more lines that (i) are all trailers, or (ii) contains at
> >> -least one Git-generated or user-configured trailer and consists of at
> >> +a group of one or more lines that (i) are all trailers, or (ii) contain at
> >> +least one Git-generated or user-configured trailer and consist of at
> >>  least 25% trailers.
> >>  The group must be preceded by one or more empty (or whitespace-only) lines.
> >>  The group must either be at the end of the message or be the last
> >
> > Ah, good catch. Maybe "a group of one or more lines that (i) consists of all
> > trailers, or (ii) contains ..."?
> 
> Your version reads better perhaps because it talks about "a group"
> without placing undue stress on the fact that the member of the
> group are usually multiple---I guess it is better over Brian's?

I'm happy to make the change to be all singular instead.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204

brian m. carlson· Feb 13, 2018, 02:23 UTC · re: brian m. carlson · lore

[PATCH v2] docs/interpret-trailers: fix agreement error

In the description of git interpret-trailers, we describe "a group…of lines" that have certain characteristics. Ensure both options describing this group use a singular verb for parallelism.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 Documentation/git-interpret-trailers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-interpret-trailers.txt +1 −1

diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 9dd19a1dd9..ff446f15f7 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -51,7 +51,7 @@ with only spaces at the end of the commit message part, one blank line
 will be added before the new trailer.
 
 Existing trailers are extracted from the input message by looking for
-a group of one or more lines that (i) are all trailers, or (ii) contains at
+a group of one or more lines that (i) is all trailers, or (ii) contains at
 least one Git-generated or user-configured trailer and consists of at
 least 25% trailers.
 The group must be preceded by one or more empty (or whitespace-only) lines.

Jonathan Tan· Feb 13, 2018, 18:41 UTC · re: brian m. carlson · lore

Re: [PATCH v2] docs/interpret-trailers: fix agreement error

On Tue, 13 Feb 2018 02:23:52 +0000 "brian m. carlson" <sandals@crustytoothpaste.net> wrote:

Show 22 quoted lines

> In the description of git interpret-trailers, we describe "a group…of
> lines" that have certain characteristics.  Ensure both options
> describing this group use a singular verb for parallelism.
> 
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
>  Documentation/git-interpret-trailers.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
> index 9dd19a1dd9..ff446f15f7 100644
> --- a/Documentation/git-interpret-trailers.txt
> +++ b/Documentation/git-interpret-trailers.txt
> @@ -51,7 +51,7 @@ with only spaces at the end of the commit message part, one blank line
>  will be added before the new trailer.
>  
>  Existing trailers are extracted from the input message by looking for
> -a group of one or more lines that (i) are all trailers, or (ii) contains at
> +a group of one or more lines that (i) is all trailers, or (ii) contains at
>  least one Git-generated or user-configured trailer and consists of at
>  least 25% trailers.
>  The group must be preceded by one or more empty (or whitespace-only) lines.

This looks good to me, thanks.