# [PATCH] branch_merged: fix grammar in warning 5 messages from 2011-02-26 to 2011-02-27. Participants: Eric Hanchrow, Jay Soffian, Junio C Hamano. Thread: https://gitlist.dev/t/26606 ## Eric Hanchrow, 2011-02-26 03:33 Subject: [PATCH] branch_merged: fix grammar in warning Message-ID: URL: https://gitlist.dev/e/AANLkTikgmA8useucn0T6Gp7m5ang8iy-a--L_2HuOk9d%40mail.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..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, 2011-02-26 03:44 Subject: Re: [PATCH] branch_merged: fix grammar in warning Message-ID: URL: https://gitlist.dev/e/AANLkTimN2ba8Ab2BRp%3DsU4NT_e6UYh4HH2L7afgEkHg8%40mail.gmail.com In-Reply-To: ``` On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow 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. ``` ## Junio C Hamano, 2011-02-26 08:24 Subject: Re: [PATCH] branch_merged: fix grammar in warning Message-ID: <7vbp1z8apg.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbp1z8apg.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Jay Soffian writes: > On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow 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, 2011-02-26 13:03 Subject: Re: [PATCH] branch_merged: fix grammar in warning Message-ID: URL: https://gitlist.dev/e/AANLkTikL1KkSTeNgT2dhE2bGBu5FHY8HiqxfjPMd90sT%40mail.gmail.com In-Reply-To: <7vbp1z8apg.fsf@alter.siamese.dyndns.org> ``` OK, here it is again: From 5445193baac417831d849b9ef5acd5197859bd0b Mon Sep 17 00:00:00 2001 From: Eric Hanchrow Date: Fri, 25 Feb 2011 19:29:42 -0800 Subject: [PATCH] branch_merged: fix grammar in warning Signed-off-by: Eric Hanchrow --- 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" -- 1.7.4.1 ``` ## Junio C Hamano, 2011-02-27 09:17 Subject: Re: [PATCH] branch_merged: fix grammar in warning Message-ID: <7vy6514z1o.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vy6514z1o.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Eric Hanchrow writes: > OK, here it is again: Thanks, applied. I ended up also dropping "has", though ;-) > From: Eric Hanchrow > Date: Fri, 25 Feb 2011 19:29:42 -0800 > Subject: [PATCH] branch_merged: fix grammar in warning > > Signed-off-by: Eric Hanchrow > --- > 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" ```