threads / patch / 26606

patchbranch_merged: fix grammar in warning

Subject: [PATCH] branch_merged: fix grammar in warning

## tl;dr

5 messages between Feb 26, 2011 and Feb 27, 2011. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Eric Hanchrow· Feb 26, 2011, 03:33 UTC · lore

 builtin/branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to builtin/branch.c +1 −1

diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4..915f270 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
 	    in_merge_bases(rev, &head_rev, 1) != merged) {
 		if (merged)
 			warning("deleting branch '%s' that has been merged to\n"
-				"         '%s', but it is not yet merged to HEAD.",
+				"         '%s', but it has not yet been merged to HEAD.",
 				name, reference_name);
 		else
 			warning("not deleting branch '%s' that is not yet merged to\n"

-- 
1.7.4.1

Jay Soffian· Feb 26, 2011, 03:44 UTC · re: Eric Hanchrow · lore

Re: [PATCH] branch_merged: fix grammar in warning

On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@gmail.com> wrote:

Show 13 quoted lines

>  builtin/branch.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 9e546e4..915f270 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
>            in_merge_bases(rev, &head_rev, 1) != merged) {
>                if (merged)
>                        warning("deleting branch '%s' that has been merged to\n"
> -                               "         '%s', but it is not yet merged to HEAD.",
> +                               "         '%s', but it has not yet been merged to HEAD.",

You can drop the "it" while you're at it. :-)

j.

Junio C Hamano· Feb 26, 2011, 08:24 UTC · re: Jay Soffian · lore

Re: [PATCH] branch_merged: fix grammar in warning

Jay Soffian <jaysoffian@gmail.com> writes:

Show 18 quoted lines

> On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@gmail.com> wrote:
>>  builtin/branch.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/builtin/branch.c b/builtin/branch.c
>> index 9e546e4..915f270 100644
>> --- a/builtin/branch.c
>> +++ b/builtin/branch.c
>> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
>>            in_merge_bases(rev, &head_rev, 1) != merged) {
>>                if (merged)
>>                        warning("deleting branch '%s' that has been merged to\n"
>> -                               "         '%s', but it is not yet merged to HEAD.",
>> +                               "         '%s', but it has not yet been merged to HEAD.",
>
> You can drop the "it" while you're at it. :-)
>
> j.

Yeah, and we would want a sign-off, too.

Eric Hanchrow· Feb 26, 2011, 13:03 UTC · re: Junio C Hamano · lore

Re: [PATCH] branch_merged: fix grammar in warning

OK, here it is again:
From 5445193baac417831d849b9ef5acd5197859bd0b Mon Sep 17 00:00:00 2001
From: Eric Hanchrow <eric.hanchrow@gmail.com>
Date: Fri, 25 Feb 2011 19:29:42 -0800
Subject: [PATCH] branch_merged: fix grammar in warning

Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>
---
 builtin/branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to builtin/branch.c +1 −1

diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4..27c2000 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
 	    in_merge_bases(rev, &head_rev, 1) != merged) {
 		if (merged)
 			warning("deleting branch '%s' that has been merged to\n"
-				"         '%s', but it is not yet merged to HEAD.",
+				"         '%s', but has not yet been merged to HEAD.",
 				name, reference_name);
 		else
 			warning("not deleting branch '%s' that is not yet merged to\n"

-- 
1.7.4.1

Junio C Hamano· Feb 27, 2011, 09:17 UTC · re: Eric Hanchrow · lore

Re: [PATCH] branch_merged: fix grammar in warning

Eric Hanchrow <eric.hanchrow@gmail.com> writes:

> OK, here it is again:

Thanks, applied.  I ended up also dropping "has", though ;-)

Show 22 quoted lines

> From: Eric Hanchrow <eric.hanchrow@gmail.com>
> Date: Fri, 25 Feb 2011 19:29:42 -0800
> Subject: [PATCH] branch_merged: fix grammar in warning
>
> Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>
> ---
>  builtin/branch.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 9e546e4..27c2000 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
>  	    in_merge_bases(rev, &head_rev, 1) != merged) {
>  		if (merged)
>  			warning("deleting branch '%s' that has been merged to\n"
> -				"         '%s', but it is not yet merged to HEAD.",
> +				"         '%s', but has not yet been merged to HEAD.",
>  				name, reference_name);
>  		else
>  			warning("not deleting branch '%s' that is not yet merged to\n"