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

[brian m. carlson]

On Thu, Feb 08, 2018 at 12:29:53PM -0800, Junio C Hamano wrote:
> Jonathan Tan  writes:
> 
> > On Thu,  8 Feb 2018 02:56:14 +
> > "brian m. carlson"  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


signature.asc
Description: PGP signature

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

[Junio C Hamano]

Jonathan Tan  writes:

> On Thu,  8 Feb 2018 02:56:14 +
> "brian m. carlson"  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?

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

[Jonathan Tan]

On Thu,  8 Feb 2018 02:56:14 +
"brian m. carlson"  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 ..."?

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

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

[brian m. carlson]

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 
---
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(-)

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