{"thread":{"id":"47786","subject":"[PATCH] docs/interpret-trailers: fix agreement error","startedAt":"2018-02-08T02:56:29Z","lastAt":"2018-02-13T18:41:23Z","messageCount":6,"participants":["brian m. carlson","Jonathan Tan","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"338688","messageId":"20180208025614.872885-1-sandals@crustytoothpaste.net","threadId":"47786","inReplyTo":null,"subject":"[PATCH] docs/interpret-trailers: fix agreement error","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-02-08T02:56:14Z","receivedAt":"2018-02-08T02:56:29Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"In the description of git interpret-trailers, we describe \"a group…of\nlines\" that have certain characteristics. Because the first option uses\na plural verb (referring to \"lines\"), the second option must also use\nplural verbs for parallelism.\n\nSigned-off-by: brian m. carlson \n---\nI'm somewhat on the fence about this patch. To me, the number\ndisagreement is very jarring. However, I'm also sympathetic to the fact\nthat the latter sentence reads more naturally in the singular.\n\nOpinions on improvements welcome.\n\n Documentation/git-interpret-trailers.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\nindex 9dd19a1dd9..de5011e564 100644\n--- a/Documentation/git-interpret-trailers.txt\n+++ b/Documentation/git-interpret-trailers.txt\n@@ -51,8 +51,8 @@ with only spaces at the end of the commit message part, one blank line\n will be added before the new trailer.\n \n Existing trailers are extracted from the input message by looking for\n-a group of one or more lines that (i) are all trailers, or (ii) contains at\n-least one Git-generated or user-configured trailer and consists of at\n+a group of one or more lines that (i) are all trailers, or (ii) contain at\n+least one Git-generated or user-configured trailer and consist of at\n least 25% trailers.\n The group must be preceded by one or more empty (or whitespace-only) lines.\n The group must either be at the end of the message or be the last\n"},{"id":"338743","messageId":"20180208101358.af4ecca9865dca4f04431bce@google.com","threadId":"47786","inReplyTo":"20180208025614.872885-1-sandals@crustytoothpaste.net","subject":"Re: [PATCH] docs/interpret-trailers: fix agreement error","fromName":"Jonathan Tan","fromEmail":"jonathantanmy@google.com","sentAt":"2018-02-08T18:13:58Z","receivedAt":"2018-02-08T18:14:07Z","isPatch":true,"sender":{"key":"jonathantanmy@fastmail.com","avatar":null},"body":"On Thu, 8 Feb 2018 02:56:14 +0000\n\"brian m. carlson\" wrote:\n\n> Existing trailers are extracted from the input message by looking for\n> -a group of one or more lines that (i) are all trailers, or (ii) contains at\n> -least one Git-generated or user-configured trailer and consists of at\n> +a group of one or more lines that (i) are all trailers, or (ii) contain at\n> +least one Git-generated or user-configured trailer and consist of at\n> least 25% trailers.\n> The group must be preceded by one or more empty (or whitespace-only) lines.\n> The group must either be at the end of the message or be the last\n\nAh, good catch. Maybe \"a group of one or more lines that (i) consists of all\ntrailers, or (ii) contains ...\"?\n\nI'm also OK with the patch as-is.\n"},{"id":"338756","messageId":"xmqqeflvql6m.fsf@gitster-ct.c.googlers.com","threadId":"47786","inReplyTo":"20180208101358.af4ecca9865dca4f04431bce@google.com","subject":"Re: [PATCH] docs/interpret-trailers: fix agreement error","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-02-08T20:29:53Z","receivedAt":"2018-02-08T20:30:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Tan writes:\n\n> On Thu, 8 Feb 2018 02:56:14 +0000\n> \"brian m. carlson\" wrote:\n>\n>> Existing trailers are extracted from the input message by looking for\n>> -a group of one or more lines that (i) are all trailers, or (ii) contains at\n>> -least one Git-generated or user-configured trailer and consists of at\n>> +a group of one or more lines that (i) are all trailers, or (ii) contain at\n>> +least one Git-generated or user-configured trailer and consist of at\n>> least 25% trailers.\n>> The group must be preceded by one or more empty (or whitespace-only) lines.\n>> The group must either be at the end of the message or be the last\n>\n> Ah, good catch. Maybe \"a group of one or more lines that (i) consists of all\n> trailers, or (ii) contains ...\"?\n\nYour version reads better perhaps because it talks about \"a group\"\nwithout placing undue stress on the fact that the member of the\ngroup are usually multiple---I guess it is better over Brian's?\n\n\n\n"},{"id":"338989","messageId":"20180210165719.GE785098@genre.crustytoothpaste.net","threadId":"47786","inReplyTo":"xmqqeflvql6m.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] docs/interpret-trailers: fix agreement error","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-02-10T16:57:19Z","receivedAt":"2018-02-10T16:57:31Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Thu, Feb 08, 2018 at 12:29:53PM -0800, Junio C Hamano wrote:\n> Jonathan Tan writes:\n> \n> > On Thu, 8 Feb 2018 02:56:14 +0000\n> > \"brian m. carlson\" wrote:\n> >\n> >> Existing trailers are extracted from the input message by looking for\n> >> -a group of one or more lines that (i) are all trailers, or (ii) contains at\n> >> -least one Git-generated or user-configured trailer and consists of at\n> >> +a group of one or more lines that (i) are all trailers, or (ii) contain at\n> >> +least one Git-generated or user-configured trailer and consist of at\n> >> least 25% trailers.\n> >> The group must be preceded by one or more empty (or whitespace-only) lines.\n> >> The group must either be at the end of the message or be the last\n> >\n> > Ah, good catch. Maybe \"a group of one or more lines that (i) consists of all\n> > trailers, or (ii) contains ...\"?\n> \n> Your version reads better perhaps because it talks about \"a group\"\n> without placing undue stress on the fact that the member of the\n> group are usually multiple---I guess it is better over Brian's?\n\nI'm happy to make the change to be all singular instead.\n-- \nbrian m. carlson / brian with sandals: Houston, Texas, US\nhttps://www.crustytoothpaste.net/~bmc | My opinion only\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"339164","messageId":"20180213022352.23742-1-sandals@crustytoothpaste.net","threadId":"47786","inReplyTo":"20180208025614.872885-1-sandals@crustytoothpaste.net","subject":"[PATCH v2] docs/interpret-trailers: fix agreement error","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-02-13T02:23:52Z","receivedAt":"2018-02-13T02:24:05Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"In the description of git interpret-trailers, we describe \"a group…of\nlines\" that have certain characteristics. Ensure both options\ndescribing this group use a singular verb for parallelism.\n\nSigned-off-by: brian m. carlson \n---\n Documentation/git-interpret-trailers.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\nindex 9dd19a1dd9..ff446f15f7 100644\n--- a/Documentation/git-interpret-trailers.txt\n+++ b/Documentation/git-interpret-trailers.txt\n@@ -51,7 +51,7 @@ with only spaces at the end of the commit message part, one blank line\n will be added before the new trailer.\n \n Existing trailers are extracted from the input message by looking for\n-a group of one or more lines that (i) are all trailers, or (ii) contains at\n+a group of one or more lines that (i) is all trailers, or (ii) contains at\n least one Git-generated or user-configured trailer and consists of at\n least 25% trailers.\n The group must be preceded by one or more empty (or whitespace-only) lines.\n"},{"id":"339217","messageId":"20180213104115.073a239b95a1b868809d08bb@google.com","threadId":"47786","inReplyTo":"20180213022352.23742-1-sandals@crustytoothpaste.net","subject":"Re: [PATCH v2] docs/interpret-trailers: fix agreement error","fromName":"Jonathan Tan","fromEmail":"jonathantanmy@google.com","sentAt":"2018-02-13T18:41:15Z","receivedAt":"2018-02-13T18:41:23Z","isPatch":true,"sender":{"key":"jonathantanmy@fastmail.com","avatar":null},"body":"On Tue, 13 Feb 2018 02:23:52 +0000\n\"brian m. carlson\" wrote:\n\n> In the description of git interpret-trailers, we describe \"a group…of\n> lines\" that have certain characteristics. Ensure both options\n> describing this group use a singular verb for parallelism.\n> \n> Signed-off-by: brian m. carlson \n> ---\n> Documentation/git-interpret-trailers.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\n> index 9dd19a1dd9..ff446f15f7 100644\n> --- a/Documentation/git-interpret-trailers.txt\n> +++ b/Documentation/git-interpret-trailers.txt\n> @@ -51,7 +51,7 @@ with only spaces at the end of the commit message part, one blank line\n> will be added before the new trailer.\n> \n> Existing trailers are extracted from the input message by looking for\n> -a group of one or more lines that (i) are all trailers, or (ii) contains at\n> +a group of one or more lines that (i) is all trailers, or (ii) contains at\n> least one Git-generated or user-configured trailer and consists of at\n> least 25% trailers.\n> The group must be preceded by one or more empty (or whitespace-only) lines.\n\nThis looks good to me, thanks.\n"}]}