{"thread":{"id":"43629","subject":"Re: git-merge-recursive segmentation error","startedAt":"2006-12-20T02:25:02Z","lastAt":"2006-12-20T03:45:53Z","messageCount":6,"participants":["Shawn Pearce","Junio C Hamano","Johannes Schindelin","Luben Tuikov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"296991","messageId":"7vtzzrmhhd.fsf@assigned-by-dhcp.cox.net","threadId":"43629","inReplyTo":"929899.78332.qm@web31809.mail.mud.yahoo.com","subject":"Re: git-merge-recursive segmentation error","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-20T02:25:02Z","receivedAt":"2006-12-20T02:25:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Luben Tuikov writes:\n\n> I also ran git-bisect twice over two well known but overlapping\n> good-bad regions and I get the same commit as being the culprit.\n> It seems to be commit 1510fea781cb0517eeba8c378964f7bc4f9577ab.\n>\n> Luben\n\nOoooooops.\n\n"},{"id":"297949","messageId":"7vpsafmh89.fsf@assigned-by-dhcp.cox.net","threadId":"43629","inReplyTo":"7vtzzrmhhd.fsf@assigned-by-dhcp.cox.net","subject":"Re: git-merge-recursive segmentation error","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-20T02:30:30Z","receivedAt":"2006-12-20T02:30:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Luben Tuikov writes:\n>\n>> I also ran git-bisect twice over two well known but overlapping\n>> good-bad regions and I get the same commit as being the culprit.\n>> It seems to be commit 1510fea781cb0517eeba8c378964f7bc4f9577ab.\n>>\n>> Luben\n>\n> Ooooooops.\n\n1510fe is buggy and it is my fault.\n\nFor now, this _should_ get you keep going.\n\nHowever, if this fixes it for you, that means we would still\nhave the problem on Cygwin X-<.\n\n-- >8 --\n[PATCH] fix populate-filespec\n\nI hand munged the original patch when committing 1510fea78.\n\nSigned-off-by: Junio C Hamano \n---\n diff.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/diff.c b/diff.c\nindex 9974435..6e6f2a7 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1223,7 +1223,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int\n \t * objects however would tend to be slower as they need\n \t * to be individually opened and inflated.\n \t */\n-\tif (FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))\n+\tif (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))\n \t\treturn 0;\n \n \tlen = strlen(name);\n-- \n1.4.4.2.g205bf\n\n"},{"id":"296757","messageId":"Pine.LNX.4.63.0612200332420.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43629","inReplyTo":"7vpsafmh89.fsf@assigned-by-dhcp.cox.net","subject":"Re: git-merge-recursive segmentation error","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-20T02:33:33Z","receivedAt":"2006-12-20T02:33:33Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 19 Dec 2006, Junio C Hamano wrote:\n\n> Junio C Hamano writes:\n> \n> > Luben Tuikov writes:\n> >\n> >> I also ran git-bisect twice over two well known but overlapping\n> >> good-bad regions and I get the same commit as being the culprit.\n> >> It seems to be commit 1510fea781cb0517eeba8c378964f7bc4f9577ab.\n> >>\n> >> Luben\n> >\n> > Ooooooops.\n> \n> 1510fe is buggy and it is my fault.\n\nYou hand munging should not have led to any segmentation fault. It would \nbe sooo nice to have the test case.\n\nCiao,\n"},{"id":"297509","messageId":"655753.13323.qm@web31812.mail.mud.yahoo.com","threadId":"43629","inReplyTo":"7vpsafmh89.fsf@assigned-by-dhcp.cox.net","subject":"Re: git-merge-recursive segmentation error","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-20T02:38:29Z","receivedAt":"2006-12-20T02:38:29Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"--- Junio C Hamano wrote:\n\n> Junio C Hamano writes:\n> \n> > Luben Tuikov writes:\n> >\n> >> I also ran git-bisect twice over two well known but overlapping\n> >> good-bad regions and I get the same commit as being the culprit.\n> >> It seems to be commit 1510fea781cb0517eeba8c378964f7bc4f9577ab.\n> >>\n> >> Luben\n> >\n> > Ooooooops.\n> \n> 1510fe is buggy and it is my fault.\n> \n> For now, this _should_ get you keep going.\n> \n> However, if this fixes it for you, that means we would still\n> have the problem on Cygwin X-<.\n\nYep -- that fixed it.\n\nThanks,\n Luben\n\n\n> \n> -- >8 --\n> [PATCH] fix populate-filespec\n> \n> I hand munged the original patch when committing 1510fea78.\n> \n> Signed-off-by: Junio C Hamano \n> ---\n> diff.c | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/diff.c b/diff.c\n> index 9974435..6e6f2a7 100644\n> --- a/diff.c\n> +++ b/diff.c\n> @@ -1223,7 +1223,7 @@ static int reuse_worktree_file(const char *name, const unsigned char\n> *sha1, int\n> \t * objects however would tend to be slower as they need\n> \t * to be individually opened and inflated.\n> \t */\n> -\tif (FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))\n> +\tif (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))\n> \t\treturn 0;\n> \n> \tlen = strlen(name);\n> -- \n> 1.4.4.2.g205bf\n> \n> \n> \n"},{"id":"296121","messageId":"20061220024317.GA27918@spearce.org","threadId":"43629","inReplyTo":"655753.13323.qm@web31812.mail.mud.yahoo.com","subject":"Re: git-merge-recursive segmentation error","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-12-20T02:43:17Z","receivedAt":"2006-12-20T02:43:17Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Luben Tuikov wrote:\n> > Junio C Hamano writes:\n> > 1510fe is buggy and it is my fault.\n> > \n> > For now, this _should_ get you keep going.\n> > \n> > However, if this fixes it for you, that means we would still\n> > have the problem on Cygwin X-<.\n> \n> Yep -- that fixed it.\n\nIt might be a problem on Cygwin. :-)\n\nI completely fail to see how this patch would cause a segfault\ndownstream in xdl_merge. All this controls is do we mmap data from\nthe working directory or decompress it from the ODB. Either way we\nshould have loaded the file size or content into the diff_filespec.\n\nMy other related change (7da41f48c) in this area has a better chance\nof causing a problem as it may be bypassing loading the file content\ninto the diff_filespec where before we were always loading it.\nHowever none of my testing ever showed that would cause a problem.\n\n-- \n"},{"id":"296492","messageId":"7vk60nmdqm.fsf@assigned-by-dhcp.cox.net","threadId":"43629","inReplyTo":"20061220024317.GA27918@spearce.org","subject":"Re: git-merge-recursive segmentation error","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-20T03:45:53Z","receivedAt":"2006-12-20T03:45:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Shawn Pearce writes:\n\n> I completely fail to see how this patch would cause a segfault\n> downstream in xdl_merge. All this controls is do we mmap data from\n> the working directory or decompress it from the ODB. Either way we\n> should have loaded the file size or content into the diff_filespec.\n\nMe neither. Quite puzzled...\n\n"}]}