{"thread":{"id":"4638","subject":"[PATCH] patch-id: \"diff-tree\" => \"commit\"","startedAt":"2006-06-23T15:36:21Z","lastAt":"2006-06-23T16:07:51Z","messageCount":3,"participants":["Johannes Schindelin","Linus Torvalds"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"22360","messageId":"Pine.LNX.4.63.0606231731280.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4638","inReplyTo":null,"subject":"[PATCH] patch-id: \"diff-tree\" => \"commit\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-06-23T15:36:21Z","receivedAt":"2006-06-23T15:36:21Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSome time ago we changed git-log in a massive way, and one consequence is\nthat the keyword changed. Adjust patch-id for that.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n---\n patch-id.c |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/patch-id.c b/patch-id.c\nindex edbc4aa..01845be 100644\n--- a/patch-id.c\n+++ b/patch-id.c\n@@ -40,8 +40,8 @@ static void generate_id_list(void)\n \t\tchar *p = line;\n \t\tint len;\n \n-\t\tif (!memcmp(line, \"diff-tree \", 10))\n-\t\t\tp += 10;\n+\t\tif (!memcmp(line, \"commit \", 7))\n+\t\t\tp += 7;\n \n \t\tif (!get_sha1_hex(p, n)) {\n \t\t\tflush_current_id(patchlen, sha1, &ctx);\n-- \n1.4.1.rc1.g406e\n"},{"id":"22362","messageId":"Pine.LNX.4.64.0606230849290.6483@g5.osdl.org","threadId":"4638","inReplyTo":"Pine.LNX.4.63.0606231731280.29667@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] patch-id: \"diff-tree\" => \"commit\"","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-06-23T15:50:28Z","receivedAt":"2006-06-23T15:50:28Z","isPatch":true,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 23 Jun 2006, Johannes Schindelin wrote:\n> \n> Some time ago we changed git-log in a massive way, and one consequence is\n> that the keyword changed. Adjust patch-id for that.\n\nAhh. Yes. Except I think you should allow both, for historical reasons (ie \nnot remove the old case).\n\n\t\tLinus\n"},{"id":"22363","messageId":"Pine.LNX.4.63.0606231800240.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4638","inReplyTo":"Pine.LNX.4.64.0606230849290.6483@g5.osdl.org","subject":"Re: [PATCH] patch-id: \"diff-tree\" => \"commit\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-06-23T16:07:51Z","receivedAt":"2006-06-23T16:07:51Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 23 Jun 2006, Linus Torvalds wrote:\n\n> On Fri, 23 Jun 2006, Johannes Schindelin wrote:\n> > \n> > Some time ago we changed git-log in a massive way, and one consequence is\n> > that the keyword changed. Adjust patch-id for that.\n> \n> Ahh. Yes. Except I think you should allow both, for historical reasons (ie \n> not remove the old case).\n\nHmm. If you are alluding to mailboxes, where there could be mails from \nolder git versions, then this might not be enough. Look at my patch, for \nexample. There is no \"diff-tree\", and no \"commit\".\n\nHowever, the only official user of patch-id is git-cherry (and indirectly, \nall users of git-cherry). And this user works on data which is generated \non the fly, i.e. there will be no \"diff-tree\" at the beginning.\n\nOf course, there is a Pandora's box: a line in a commit message is much \nmore likely to start with \"commit <sha1>\" than \"diff-tree <sha1>\". So my \npatch probably breaks many cases.\n\nCiao,\nDscho\n"}]}