# (unknown) 4 messages from 2006-10-25 to 2006-10-26. Participants: andyparkins@gmail.com, Andy Parkins, Junio C Hamano. Thread: https://gitlist.dev/t/43363 ## andyparkins@gmail.com, 2006-10-25 14:49 Subject: (unknown) Message-ID: URL: https://gitlist.dev/e/E1Gck4m-0003J1-00%40dvr.360vision.com ``` From b149c0fca7399030225750958bf5c962c3796b44 Mon Sep 17 00:00:00 2001 From: Andy Parkins 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 --- 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, 2006-10-25 18:41 Subject: Re: (unknown) Message-ID: <7vk62ob5mp.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vk62ob5mp.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` andyparkins@gmail.com writes: > From b149c0fca7399030225750958bf5c962c3796b44 Mon Sep 17 00:00:00 2001 > From: Andy Parkins > 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, 2006-10-26 07:45 Subject: Re: Make new builtin cherry match documentation for "+" and "-" Message-ID: <200610260845.23850.andyparkins@gmail.com> URL: https://gitlist.dev/e/200610260845.23850.andyparkins%40gmail.com In-Reply-To: <7vk62ob5mp.fsf@assigned-by-dhcp.cox.net> ``` 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"? Andy -- Dr Andy Parkins, M Eng (hons), MIEE ``` ## Junio C Hamano, 2006-10-26 08:22 Subject: Re: Make new builtin cherry match documentation for "+" and "-" Message-ID: <7vd58fqyfi.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vd58fqyfi.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <200610260845.23850.andyparkins@gmail.com> ``` Andy Parkins writes: > 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". ```