From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id C80271F506 for ; Tue, 20 Sep 2022 21:57:28 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=ttaylorr-com.20210112.gappssmtp.com header.i=@ttaylorr-com.20210112.gappssmtp.com header.b="qrMHDx4n"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbiITV5U (ORCPT ); Tue, 20 Sep 2022 17:57:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229631AbiITV5T (ORCPT ); Tue, 20 Sep 2022 17:57:19 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8F6761135 for ; Tue, 20 Sep 2022 14:57:18 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id d8so3519899iof.11 for ; Tue, 20 Sep 2022 14:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20210112.gappssmtp.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=8uP8gCsWHaSiVjatF33DtVXQSVuSqiV9UCJ6Gigw8cw=; b=qrMHDx4nraWDan4K+IQHxskG/+xwk0IHAZoY0sRQpxnoZsuXWC1dizZMiqSaKHs4RI JYzvDQafcO8QLCCYLhBRbZowBF/hPe9u4TTlQlOiSJqB1iW/W9OmZCB+G9ZJWbMoTLdN BtWEcaQaBTQ9/1j1SCk+0LI+bwyORTg/erskto6GuS+ojF1n+n1IQulVHWOle/QaAH4x VjJGGsZx8AHWmhseNdsTRN5ltEstI5jDISy2A2quraz+3EWJyL6oDu3wFaxS3bxqIQD4 KZ82AuiSBFsq+SHafaVZMq5GCKTcDjdBpGet9KYkHpqxSt2XXSSY1uP2U/TS3Nt9ctZ4 dYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=8uP8gCsWHaSiVjatF33DtVXQSVuSqiV9UCJ6Gigw8cw=; b=Wh3PmI89yfoQCGFrks0j8/sxyWv6JDTsgz8m1Zxxuhd+XYRrB5KCNbIX96lB3QLTx/ sb0shbRsHEUdJNfBL6uMZmMTCYfKxmZGEv1XwjkyQPoH5tR+Xg7/7+oQOlFvtvCbWj4q 7aylbU4euvDP7WZcTQfjtrWMcgNIQvWhd8+Vz/e9qxmaInLpxiAohvqHHKwJnLLs8Bog Ibs2iKgVWSIRh8otdRzIIARvB7gC0cDIH/ofSkfQIthpWuqVSOpvxjvmkLdX77W9xYMy yhl3bchGGTx3I5X3OTXEbiRjqUxcRg/zbnZ3g44d8qXu7ycvugLwTAznSkyfuER4l12L iKzw== X-Gm-Message-State: ACrzQf2ktK7MqP+eoWIDPNbJpnXJ8ZxmY6z6YRHKh7oLLcccxDKPQo9k Y5N4057hfIVnNJtv1vSF2UUaSQ== X-Google-Smtp-Source: AMsMyM5kb0YjuNk8AHCMmiGb4qNuyUePoNvJNEUkT/BZAV2D/kRd44CebIUektq1MjlzEmm+bypDDw== X-Received: by 2002:a6b:7213:0:b0:69e:5f45:df22 with SMTP id n19-20020a6b7213000000b0069e5f45df22mr10226916ioc.180.1663711038103; Tue, 20 Sep 2022 14:57:18 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with ESMTPSA id d5-20020a026205000000b0035a242f30b6sm328529jac.175.2022.09.20.14.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 14:57:17 -0700 (PDT) Date: Tue, 20 Sep 2022 17:57:16 -0400 From: Taylor Blau To: Johannes Schindelin Cc: Taylor Blau , git@vger.kernel.org, Elijah Newren Subject: Re: [BUG] seemingly-rare segfault in merge-tree Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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