On Tue, Sep 20, 2022 at 11:24:00PM +0200, Johannes Schindelin wrote: > I am afraid that there is way more custom code from GitHub's internal fork > involved in this report than meets the eye. The `result.tree` that is most > likely the cause of the segmentation fault does not actually stem from > `merge_incore_recursive()` as the linked source code might suggest. > > Instead, it stems from the `merge_incore_nonrecursive()` call in the > custom code that allows to specify a merge base manually (rather than let > `git merge-tree` perform a full recursive merge). Custom code, I need to > add, that is nowhere to be seen in upstream Git. Ah, thanks. I didn't recall off-hand the extent of the custom code GitHub is carrying to support merge-tree. If this has nothing to do with any code in the open-source project, then please feel free to drop the list from any more emails on this thread. > I did hint at this custom code during the Git Contributor Summit, and > there seemed to be enough interest that I had appended an item to my > ever-growing todo list to upstream this. Yes, that would be great. Thanks, Taylor
