{"thread":{"id":"43432","subject":"Re: git-merge-recursive segmentation error","startedAt":"2006-12-20T02:18:59Z","lastAt":"2006-12-20T02:31:35Z","messageCount":2,"participants":["Johannes Schindelin","Luben Tuikov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"298416","messageId":"427701.7195.qm@web31811.mail.mud.yahoo.com","threadId":"43432","inReplyTo":"Pine.LNX.4.63.0612200217300.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: git-merge-recursive segmentation error","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-20T02:18:59Z","receivedAt":"2006-12-20T02:18:59Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> Hi,\n> \n> On Tue, 19 Dec 2006, Luben Tuikov wrote:\n> \n> > Auto-merging init/version.c\n> > /home/luben/bin/git-merge: line 394: 12030 \n> > Segmentation fault git-merge-$strategy $common -- \"$head_arg\" \"$@\"\n> \n> Do you have any pointers how to get the two branches you try to merge? I'd \n> be most grateful to have the sha1's of both heads, too...\n\nThe source tree is Linus' \"master\" tree.  The destination tree\nis my own \"dev\" tree, which I use as an intermediate tree, before \nmerging into my own kernel trees.\n\nHopefully with the backtrace I posted and with the big-bisect\nresults pointing to the culprit commit, someone can get a patch out\nto fix this.\n\n    Luben\n"},{"id":"294762","messageId":"Pine.LNX.4.63.0612200329530.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43432","inReplyTo":"427701.7195.qm@web31811.mail.mud.yahoo.com","subject":"Re: git-merge-recursive segmentation error","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-20T02:31:35Z","receivedAt":"2006-12-20T02:31:35Z","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, Luben Tuikov wrote:\n\n> --- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> > Hi,\n> > \n> > On Tue, 19 Dec 2006, Luben Tuikov wrote:\n> > \n> > > Auto-merging init/version.c\n> > > /home/luben/bin/git-merge: line 394: 12030 \n> > > Segmentation fault git-merge-$strategy $common -- \"$head_arg\" \"$@\"\n> > \n> > Do you have any pointers how to get the two branches you try to merge? I'd \n> > be most grateful to have the sha1's of both heads, too...\n> \n> The source tree is Linus' \"master\" tree.  The destination tree\n> is my own \"dev\" tree, which I use as an intermediate tree, before \n> merging into my own kernel trees.\n> \n> Hopefully with the backtrace I posted and with the big-bisect\n> results pointing to the culprit commit, someone can get a patch out\n> to fix this.\n\nGiven that you have an optimized git (it even optimized orig out!), and \nthat the commit you bisected says \"Avoid accessing a slow working copy \nduring diffcore operations.\" which has nothing to do at all with \nmerge-recursive, I give up. I don't have enough information. Really.\n\nCiao,\nDscho\n\n"}]}