threads / discuss / 43363

(unknown)

Subject: (unknown)

## tl;dr

4 messages between Oct 25, 2006 and Oct 26, 2006.

replies: 3people: 2as markdown or json

andyparkins@gmail.com· Oct 25, 2006, 14:49 UTC · lore

From b149c0fca7399030225750958bf5c962c3796b44 Mon Sep 17 00:00:00 2001
From: Andy Parkins <andyparkins@gmail.com>
Date: Wed, 25 Oct 2006 15:49:50 +0100
Subject: [PATCH] Make new builtin cherry match documentation for "+" and "-"
To: git@vger.kernel.org
X-TUID: 218b478df3f8d847
X-UID: 128
X-Length: 1090
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200610251549.51121.andyparkins@gmail.com>

"+" and "-" don't match the documentation, where "+" means the patch /is/ in
upstream, "-" means it isn't
Signed-off-by: Andy Parkins <andyparkins@gmail.com>
---
 builtin-log.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin-log.c b/builtin-log.c
index 840c742..8ded627 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -519,12 +519,12 @@ int cmd_cherry(int argc, const char **ar
 
 	while (list) {
 		unsigned char sha1[20];
-		char sign = '+';
+		char sign = '-';
 
 		commit = list->item;
 		if (!get_patch_id(commit, &patch_id_opts, sha1) &&
 		    lookup_object(sha1))
-			sign = '-';
+			sign = '+';
 
 		if (verbose) {
 			static char buf[16384];

-- 
1.4.2.3

Junio C Hamano· Oct 25, 2006, 18:41 UTC · re: andyparkins@gmail.com · lore

Re: (unknown)

andyparkins@gmail.com writes:

Show 12 quoted lines

> From b149c0fca7399030225750958bf5c962c3796b44 Mon Sep 17 00:00:00 2001
> From: Andy Parkins <andyparkins@gmail.com>
> Date: Wed, 25 Oct 2006 15:49:50 +0100
> Subject: [PATCH] Make new builtin cherry match documentation for "+" and "-"
> To: git@vger.kernel.org
> X-TUID: 218b478df3f8d847
> X-UID: 128
> X-Length: 1090
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Content-Disposition: inline
> Message-Id: <200610251549.51121.andyparkins@gmail.com>

I'd be commenting on your patch but won't be able to take any of them until these "Subject: (unknown)" are corrected.

> "+" and "-" don't match the documentation, where "+" means the patch /is/ in
> upstream, "-" means it isn't

The documentation was utterly wrong. The comment at the beginning of git-cherry.sh was better but slightly wrong.

I have a few fixes queued but I was busy for the last couple of nights and haven't pushed them out.

Andy Parkins· Oct 26, 2006, 07:45 UTC · re: Junio C Hamano · lore

Re: Make new builtin cherry match documentation for "+" and "-"

On Wednesday 2006 October 25 19:41, Junio C Hamano wrote:

Show 5 quoted lines

> > "+" and "-" don't match the documentation, where "+" means the patch /is/
> > in upstream, "-" means it isn't
>
> The documentation was utterly wrong.  The comment at the
> beginning of git-cherry.sh was better but slightly wrong.

Seriously? In git-cherry output a "-" means that a patch is in? Seems counter-intuitive to me.

Or is it meant to be analogous to a diff so "+" means "in order to make this branch like the comparison branch you would have to /add/ this patch"?

Andy

-- 
Dr Andy Parkins, M Eng (hons), MIEE

Junio C Hamano· Oct 26, 2006, 08:22 UTC · re: Andy Parkins · lore

Re: Make new builtin cherry match documentation for "+" and "-"

Andy Parkins <andyparkins@gmail.com> writes:

Show 13 quoted lines

> On Wednesday 2006 October 25 19:41, Junio C Hamano wrote:
>
>> > "+" and "-" don't match the documentation, where "+" means the patch /is/
>> > in upstream, "-" means it isn't
>>
>> The documentation was utterly wrong.  The comment at the
>> beginning of git-cherry.sh was better but slightly wrong.
>
> Seriously?  In git-cherry output a "-" means that a patch is in?  Seems 
> counter-intuitive to me.
>
> Or is it meant to be analogous to a diff so "+" means "in order to make this 
> branch like the comparison branch you would have to /add/ this patch"?

It's more like "This is still relevant and you need to positively push your upstream for inclusion".