{"thread":{"id":"26606","subject":"[PATCH] branch_merged: fix grammar in warning","startedAt":"2011-02-26T03:33:14Z","lastAt":"2011-02-27T09:17:07Z","messageCount":5,"participants":["Eric Hanchrow","Jay Soffian","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"162282","messageId":"AANLkTikgmA8useucn0T6Gp7m5ang8iy-a--L_2HuOk9d@mail.gmail.com","threadId":"26606","inReplyTo":null,"subject":"[PATCH] branch_merged: fix grammar in warning","fromName":"Eric Hanchrow","fromEmail":"eric.hanchrow@gmail.com","sentAt":"2011-02-26T03:33:14Z","receivedAt":"2011-02-26T03:33:14Z","isPatch":true,"sender":{"key":"eric.hanchrow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3145?v=4"},"body":" builtin/branch.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex 9e546e4..915f270 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,\n \t    in_merge_bases(rev, &head_rev, 1) != merged) {\n \t\tif (merged)\n \t\t\twarning(\"deleting branch '%s' that has been merged to\\n\"\n-\t\t\t\t\"         '%s', but it is not yet merged to HEAD.\",\n+\t\t\t\t\"         '%s', but it has not yet been merged to HEAD.\",\n \t\t\t\tname, reference_name);\n \t\telse\n \t\t\twarning(\"not deleting branch '%s' that is not yet merged to\\n\"\n-- \n1.7.4.1\n"},{"id":"162283","messageId":"AANLkTimN2ba8Ab2BRp=sU4NT_e6UYh4HH2L7afgEkHg8@mail.gmail.com","threadId":"26606","inReplyTo":"AANLkTikgmA8useucn0T6Gp7m5ang8iy-a--L_2HuOk9d@mail.gmail.com","subject":"Re: [PATCH] branch_merged: fix grammar in warning","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2011-02-26T03:44:21Z","receivedAt":"2011-02-26T03:44:21Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@gmail.com> wrote:\n>  builtin/branch.c |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/builtin/branch.c b/builtin/branch.c\n> index 9e546e4..915f270 100644\n> --- a/builtin/branch.c\n> +++ b/builtin/branch.c\n> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,\n>            in_merge_bases(rev, &head_rev, 1) != merged) {\n>                if (merged)\n>                        warning(\"deleting branch '%s' that has been merged to\\n\"\n> -                               \"         '%s', but it is not yet merged to HEAD.\",\n> +                               \"         '%s', but it has not yet been merged to HEAD.\",\n\nYou can drop the \"it\" while you're at it. :-)\n\nj.\n"},{"id":"162293","messageId":"7vbp1z8apg.fsf@alter.siamese.dyndns.org","threadId":"26606","inReplyTo":"AANLkTimN2ba8Ab2BRp=sU4NT_e6UYh4HH2L7afgEkHg8@mail.gmail.com","subject":"Re: [PATCH] branch_merged: fix grammar in warning","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-26T08:24:43Z","receivedAt":"2011-02-26T08:24:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jay Soffian <jaysoffian@gmail.com> writes:\n\n> On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@gmail.com> wrote:\n>>  builtin/branch.c |    2 +-\n>>  1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/builtin/branch.c b/builtin/branch.c\n>> index 9e546e4..915f270 100644\n>> --- a/builtin/branch.c\n>> +++ b/builtin/branch.c\n>> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,\n>>            in_merge_bases(rev, &head_rev, 1) != merged) {\n>>                if (merged)\n>>                        warning(\"deleting branch '%s' that has been merged to\\n\"\n>> -                               \"         '%s', but it is not yet merged to HEAD.\",\n>> +                               \"         '%s', but it has not yet been merged to HEAD.\",\n>\n> You can drop the \"it\" while you're at it. :-)\n>\n> j.\n\nYeah, and we would want a sign-off, too.\n"},{"id":"162311","messageId":"AANLkTikL1KkSTeNgT2dhE2bGBu5FHY8HiqxfjPMd90sT@mail.gmail.com","threadId":"26606","inReplyTo":"7vbp1z8apg.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] branch_merged: fix grammar in warning","fromName":"Eric Hanchrow","fromEmail":"eric.hanchrow@gmail.com","sentAt":"2011-02-26T13:03:37Z","receivedAt":"2011-02-26T13:03:37Z","isPatch":true,"sender":{"key":"eric.hanchrow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3145?v=4"},"body":"OK, here it is again:\nFrom 5445193baac417831d849b9ef5acd5197859bd0b Mon Sep 17 00:00:00 2001\nFrom: Eric Hanchrow <eric.hanchrow@gmail.com>\nDate: Fri, 25 Feb 2011 19:29:42 -0800\nSubject: [PATCH] branch_merged: fix grammar in warning\n\nSigned-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>\n---\n builtin/branch.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex 9e546e4..27c2000 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,\n \t    in_merge_bases(rev, &head_rev, 1) != merged) {\n \t\tif (merged)\n \t\t\twarning(\"deleting branch '%s' that has been merged to\\n\"\n-\t\t\t\t\"         '%s', but it is not yet merged to HEAD.\",\n+\t\t\t\t\"         '%s', but has not yet been merged to HEAD.\",\n \t\t\t\tname, reference_name);\n \t\telse\n \t\t\twarning(\"not deleting branch '%s' that is not yet merged to\\n\"\n-- \n1.7.4.1\n"},{"id":"162346","messageId":"7vy6514z1o.fsf@alter.siamese.dyndns.org","threadId":"26606","inReplyTo":"AANLkTikL1KkSTeNgT2dhE2bGBu5FHY8HiqxfjPMd90sT@mail.gmail.com","subject":"Re: [PATCH] branch_merged: fix grammar in warning","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-27T09:17:07Z","receivedAt":"2011-02-27T09:17:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Hanchrow <eric.hanchrow@gmail.com> writes:\n\n> OK, here it is again:\n\nThanks, applied.  I ended up also dropping \"has\", though ;-)\n\n> From: Eric Hanchrow <eric.hanchrow@gmail.com>\n> Date: Fri, 25 Feb 2011 19:29:42 -0800\n> Subject: [PATCH] branch_merged: fix grammar in warning\n>\n> Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>\n> ---\n>  builtin/branch.c |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/builtin/branch.c b/builtin/branch.c\n> index 9e546e4..27c2000 100644\n> --- a/builtin/branch.c\n> +++ b/builtin/branch.c\n> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,\n>  \t    in_merge_bases(rev, &head_rev, 1) != merged) {\n>  \t\tif (merged)\n>  \t\t\twarning(\"deleting branch '%s' that has been merged to\\n\"\n> -\t\t\t\t\"         '%s', but it is not yet merged to HEAD.\",\n> +\t\t\t\t\"         '%s', but has not yet been merged to HEAD.\",\n>  \t\t\t\tname, reference_name);\n>  \t\telse\n>  \t\t\twarning(\"not deleting branch '%s' that is not yet merged to\\n\"\n"}]}