{"thread":{"id":"43363","subject":"(unknown)","startedAt":"2006-10-25T14:49:52Z","lastAt":"2006-10-26T08:22:09Z","messageCount":4,"participants":["andyparkins@gmail.com","Andy Parkins","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"294504","messageId":"E1Gck4m-0003J1-00@dvr.360vision.com","threadId":"43363","inReplyTo":null,"subject":"(unknown)","fromName":"","fromEmail":"andyparkins@gmail.com","sentAt":"2006-10-25T14:49:52Z","receivedAt":"2006-10-25T14:49:52Z","isPatch":false,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"From b149c0fca7399030225750958bf5c962c3796b44 Mon Sep 17 00:00:00 2001\nFrom: Andy Parkins \nDate: Wed, 25 Oct 2006 15:49:50 +0100\nSubject: [PATCH] Make new builtin cherry match documentation for \"+\" and \"-\"\nTo: git@vger.kernel.org\nX-TUID: 218b478df3f8d847\nX-UID: 128\nX-Length: 1090\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nContent-Disposition: inline\nMessage-Id: <200610251549.51121.andyparkins@gmail.com>\n\n\"+\" and \"-\" don't match the documentation, where \"+\" means the patch /is/ in\nupstream, \"-\" means it isn't\nSigned-off-by: Andy Parkins \n---\n builtin-log.c | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 840c742..8ded627 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -519,12 +519,12 @@ int cmd_cherry(int argc, const char **ar\n \n \twhile (list) {\n \t\tunsigned char sha1[20];\n-\t\tchar sign = '+';\n+\t\tchar sign = '-';\n \n \t\tcommit = list->item;\n \t\tif (!get_patch_id(commit, &patch_id_opts, sha1) &&\n \t\t lookup_object(sha1))\n-\t\t\tsign = '-';\n+\t\t\tsign = '+';\n \n \t\tif (verbose) {\n \t\t\tstatic char buf[16384];\n-- \n1.4.2.3\n\n"},{"id":"297427","messageId":"7vk62ob5mp.fsf@assigned-by-dhcp.cox.net","threadId":"43363","inReplyTo":"E1Gck4m-0003J1-00@dvr.360vision.com","subject":"Re: (unknown)","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-25T18:41:02Z","receivedAt":"2006-10-25T18:41:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"andyparkins@gmail.com writes:\n\n> From b149c0fca7399030225750958bf5c962c3796b44 Mon Sep 17 00:00:00 2001\n> From: Andy Parkins \n> Date: Wed, 25 Oct 2006 15:49:50 +0100\n> Subject: [PATCH] Make new builtin cherry match documentation for \"+\" and \"-\"\n> To: git@vger.kernel.org\n> X-TUID: 218b478df3f8d847\n> X-UID: 128\n> X-Length: 1090\n> MIME-Version: 1.0\n> Content-Transfer-Encoding: 7bit\n> Content-Disposition: inline\n> Message-Id: <200610251549.51121.andyparkins@gmail.com>\n\nI'd be commenting on your patch but won't be able to take any of\nthem until these \"Subject: (unknown)\" are corrected.\n\n> \"+\" and \"-\" don't match the documentation, where \"+\" means the patch /is/ in\n> upstream, \"-\" means it isn't\n\nThe documentation was utterly wrong. The comment at the\nbeginning of git-cherry.sh was better but slightly wrong.\n\nI have a few fixes queued but I was busy for the last couple of\nnights and haven't pushed them out.\n"},{"id":"295476","messageId":"200610260845.23850.andyparkins@gmail.com","threadId":"43363","inReplyTo":"7vk62ob5mp.fsf@assigned-by-dhcp.cox.net","subject":"Re: Make new builtin cherry match documentation for \"+\" and \"-\"","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2006-10-26T07:45:22Z","receivedAt":"2006-10-26T07:45:22Z","isPatch":false,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"On Wednesday 2006 October 25 19:41, Junio C Hamano wrote:\n\n> > \"+\" and \"-\" don't match the documentation, where \"+\" means the patch /is/\n> > in upstream, \"-\" means it isn't\n>\n> The documentation was utterly wrong. The comment at the\n> beginning of git-cherry.sh was better but slightly wrong.\n\nSeriously? In git-cherry output a \"-\" means that a patch is in? Seems \ncounter-intuitive to me.\n\nOr is it meant to be analogous to a diff so \"+\" means \"in order to make this \nbranch like the comparison branch you would have to /add/ this patch\"?\n\n\nAndy\n\n-- \nDr Andy Parkins, M Eng (hons), MIEE\n"},{"id":"297508","messageId":"7vd58fqyfi.fsf@assigned-by-dhcp.cox.net","threadId":"43363","inReplyTo":"200610260845.23850.andyparkins@gmail.com","subject":"Re: Make new builtin cherry match documentation for \"+\" and \"-\"","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-26T08:22:09Z","receivedAt":"2006-10-26T08:22:09Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andy Parkins writes:\n\n> On Wednesday 2006 October 25 19:41, Junio C Hamano wrote:\n>\n>> > \"+\" and \"-\" don't match the documentation, where \"+\" means the patch /is/\n>> > in upstream, \"-\" means it isn't\n>>\n>> The documentation was utterly wrong. The comment at the\n>> beginning of git-cherry.sh was better but slightly wrong.\n>\n> Seriously? In git-cherry output a \"-\" means that a patch is in? Seems \n> counter-intuitive to me.\n>\n> Or is it meant to be analogous to a diff so \"+\" means \"in order to make this \n> branch like the comparison branch you would have to /add/ this patch\"?\n\nIt's more like \"This is still relevant and you need to\npositively push your upstream for inclusion\".\n"}]}