git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH] docs/interpret-trailers: fix agreement error
@ 2018-02-08  2:56 brian m. carlson
  2018-02-08 18:13 ` Jonathan Tan
  2018-02-13  2:23 ` [PATCH v2] " brian m. carlson
  0 siblings, 2 replies; 6+ messages in thread
From: brian m. carlson @ 2018-02-08  2:56 UTC (permalink / raw)
  To: git; +Cc: Jonathan Tan, Christian Couder

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

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] docs/interpret-trailers: fix agreement error
  2018-02-08  2:56 [PATCH] docs/interpret-trailers: fix agreement error brian m. carlson
@ 2018-02-08 18:13 ` Jonathan Tan
  2018-02-08 20:29   ` Junio C Hamano
  2018-02-13  2:23 ` [PATCH v2] " brian m. carlson
  1 sibling, 1 reply; 6+ messages in thread
From: Jonathan Tan @ 2018-02-08 18:13 UTC (permalink / raw)
  To: brian m. carlson; +Cc: git, Christian Couder

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 ..."?

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] docs/interpret-trailers: fix agreement error
  2018-02-08 18:13 ` Jonathan Tan
@ 2018-02-08 20:29   ` Junio C Hamano
  2018-02-10 16:57     ` brian m. carlson
  0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2018-02-08 20:29 UTC (permalink / raw)
  To: Jonathan Tan; +Cc: brian m. carlson, git, Christian Couder

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?




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] docs/interpret-trailers: fix agreement error
  2018-02-08 20:29   ` Junio C Hamano
@ 2018-02-10 16:57     ` brian m. carlson
  0 siblings, 0 replies; 6+ messages in thread
From: brian m. carlson @ 2018-02-10 16:57 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Jonathan Tan, git, Christian Couder

[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]

On Thu, Feb 08, 2018 at 12:29:53PM -0800, Junio C Hamano wrote:
> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 867 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2] docs/interpret-trailers: fix agreement error
  2018-02-08  2:56 [PATCH] docs/interpret-trailers: fix agreement error brian m. carlson
  2018-02-08 18:13 ` Jonathan Tan
@ 2018-02-13  2:23 ` " brian m. carlson
  2018-02-13 18:41   ` Jonathan Tan
  1 sibling, 1 reply; 6+ messages in thread
From: brian m. carlson @ 2018-02-13  2:23 UTC (permalink / raw)
  To: git; +Cc: Jonathan Tan, Christian Couder

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.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] docs/interpret-trailers: fix agreement error
  2018-02-13  2:23 ` [PATCH v2] " brian m. carlson
@ 2018-02-13 18:41   ` Jonathan Tan
  0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Tan @ 2018-02-13 18:41 UTC (permalink / raw)
  To: brian m. carlson; +Cc: git, Christian Couder

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

> 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.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-08  2:56 [PATCH] docs/interpret-trailers: fix agreement error brian m. carlson
2018-02-08 18:13 ` Jonathan Tan
2018-02-08 20:29   ` Junio C Hamano
2018-02-10 16:57     ` brian m. carlson
2018-02-13  2:23 ` [PATCH v2] " brian m. carlson
2018-02-13 18:41   ` Jonathan Tan

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox