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: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 932B61F466 for ; Tue, 4 Feb 2020 03:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727150AbgBDD7G (ORCPT ); Mon, 3 Feb 2020 22:59:06 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45751 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726930AbgBDD7G (ORCPT ); Mon, 3 Feb 2020 22:59:06 -0500 Received: by mail-pl1-f195.google.com with SMTP id b22so6685021pls.12 for ; Mon, 03 Feb 2020 19:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=iOkEXn+E9haL6iZj8smLuyY0tPYoYYjzx10ulu3uzbg=; b=wa4PaXFRbMcF4yUu/ksLyPlHTDgmxCY+fHvveMVSK5tDpi4/ZnV8opg9ZzlTAPDifE cslmssMwncqK0I5P/O2zJwZ8H6Oq2Y1+19k0FoRT71bE0de+fLVF4z+nxfJmghfjetDu nRxJ3ryWA0BPbatXzrtZV+iSXMTWBwgitj8csi4drYJGkfMnBpBnzM75H3bSGWE9AQl0 PYpUO61TW0IMYnUE3fXh3aGXXs+ZGK9IjpK364JTa3GjNxWbgnWkmh2tSjQjs/lC5usx CdE5aY6X+w3ZwPfa0kXdDk0KrlgaUfFfeUvz+buuKsQ+UMOY8bPixuEJdysbMRpBHfXY AhFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=iOkEXn+E9haL6iZj8smLuyY0tPYoYYjzx10ulu3uzbg=; b=Bn5kekwAQ5nBrCHRvQC5lwlWAmq9Z/6/Ykh+uKJtM2hqbtz2pb0umhUgspBzygB+IU DYUrqUiuSHweBhpaKia6qgj8bvAD/Fi9EXgbFVRfftygbyQIo32T8ynQ+yQvqvte+JlP GMvQUEJUI7L9c6IMl68Owx0a4INqxBSfxr0W2gQ82qDLO/WdE+aW+/KP6xSQYi8k+k8P n0abf0IhIdpCIpIGGuidHbSEXcQPpPv3rjTMJtt0enPpvL/3N0n2hSFDAGdSNXafskTV 176dCs08XI/8AryBzX2iHj7LaHElIN3cq8J4SW2EKxmZ6SBU0l0GrB/8T3h54U+W5SNj kBtA== X-Gm-Message-State: APjAAAVm18eqWVVhRlItT/+a/1Cna46jleiymFIMxJFioqCaUtyG8nGx aClgOfc5WVRnbYHCn83qOLXuNA== X-Google-Smtp-Source: APXvYqxntCek4EZxJTTtz8hzMkF60n2cwmZqYlczU6+MsWkfkTr0bBTckV/Rl5XmB6PePi/Jqnl9eA== X-Received: by 2002:a17:902:8d94:: with SMTP id v20mr18064589plo.259.1580788744126; Mon, 03 Feb 2020 19:59:04 -0800 (PST) Received: from localhost ([2601:602:9200:32b0:7c5e:a7ec:bd9e:cd59]) by smtp.gmail.com with ESMTPSA id s5sm11501698pgc.73.2020.02.03.19.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 19:59:03 -0800 (PST) Date: Mon, 3 Feb 2020 19:59:03 -0800 From: Taylor Blau To: SZEDER =?utf-8?B?R8OhYm9y?= Cc: Taylor Blau , git@vger.kernel.org, peff@peff.net, dstolee@microsoft.com, gitster@pobox.com Subject: Re: [PATCH 1/3] builtin/commit-graph.c: support '--split[=]' Message-ID: <20200204035903.GC5790@syl.local> References: <4f5bc19903f8a1f5b153b5665de378e743e12744.1580430057.git.me@ttaylorr.com> <20200131233434.GJ10482@szeder.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200131233434.GJ10482@szeder.dev> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sat, Feb 01, 2020 at 12:34:34AM +0100, SZEDER Gábor wrote: > On Thu, Jan 30, 2020 at 04:28:17PM -0800, Taylor Blau wrote: > > diff --git a/commit-graph.c b/commit-graph.c > > index 6d34829f57..02e6ad9d1f 100644 > > --- a/commit-graph.c > > +++ b/commit-graph.c > > @@ -1565,15 +1565,18 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) > > num_commits = ctx->commits.nr; > > ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1; > > > > - while (g && (g->num_commits <= size_mult * num_commits || > > - (max_commits && num_commits > max_commits))) { > > - if (g->odb != ctx->odb) > > - break; > > + if (ctx->split_opts->flags != COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED) { > > This line segfaults in the tests 'fetch.writeCommitGraph' and > 'fetch.writeCommitGraph with submodules' in 't5510-fetch.sh', because > 'git fetch' doesn't pass a 'split_opts' to the commit-graph functions. Thanks for pointing it out. I responded in more detail lower in the thread with the fix, but I appreciate your testing each patch. Clearly, I just should have run the full suite myself before sending! > Thread 1 "git" received signal SIGSEGV, Segmentation fault. > 0x00000000005113dd in split_graph_merge_strategy (ctx=0x9ca930) > at commit-graph.c:1568 > 1568 if (ctx->split_opts->flags != COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED) { > (gdb) p *ctx > $1 = {r = 0x9ae2a0 , odb = 0x9c0df0, graph_name = 0x0, oids = { > list = 0xa02660, nr = 12, alloc = 1024}, commits = {list = 0x9caa00, > nr = 6, alloc = 6}, num_extra_edges = 0, approx_nr_objects = 0, > progress = 0x0, progress_done = 0, progress_cnt = 0, base_graph_name = 0x0, > num_commit_graphs_before = 0, num_commit_graphs_after = 1, > commit_graph_filenames_before = 0x0, commit_graph_filenames_after = 0x0, > commit_graph_hash_after = 0x0, new_num_commits_in_base = 0, > new_base_graph = 0x0, append = 0, report_progress = 1, split = 1, > check_oids = 0, split_opts = 0x0} > ^^^^^^^^^^^^^^^^ > (gdb) bt > #0 0x00000000005113dd in split_graph_merge_strategy (ctx=0x9ca930) > at commit-graph.c:1568 > #1 0x0000000000512446 in write_commit_graph (odb=0x9c0df0, pack_indexes=0x0, > commit_hex=0x7fffffffd550, > flags=(COMMIT_GRAPH_WRITE_PROGRESS | COMMIT_GRAPH_WRITE_SPLIT), > split_opts=0x0) at commit-graph.c:1891 > #2 0x000000000050fd86 in write_commit_graph_reachable (odb=0x9c0df0, > flags=(COMMIT_GRAPH_WRITE_PROGRESS | COMMIT_GRAPH_WRITE_SPLIT), > split_opts=0x0) at commit-graph.c:1174 > ^^^^^^^^^^^^^^ > #3 0x0000000000444ea4 in cmd_fetch (argc=0, argv=0x7fffffffd9b8, prefix=0x0) > at builtin/fetch.c:1873 > #4 0x0000000000406154 in run_builtin (p=0x969a88 , argc=2, > argv=0x7fffffffd9b0) at git.c:444 > #5 0x00000000004064a4 in handle_builtin (argc=2, argv=0x7fffffffd9b0) > at git.c:674 > #6 0x000000000040674c in run_argv (argcp=0x7fffffffd84c, argv=0x7fffffffd840) > at git.c:741 > #7 0x0000000000406bbd in cmd_main (argc=2, argv=0x7fffffffd9b0) at git.c:872 > #8 0x00000000004cfd4e in main (argc=5, argv=0x7fffffffd998) > at common-main.c:52 > > Note that this function split_graph_merge_strategy() does look at > various fields in 'ctx->split_opts' a bit earlier, but those accesses > are protected by a 'if (ctx->split_opts)' condition. > expire_commit_graphs() does the same. > > > > + while (g && (g->num_commits <= size_mult * num_commits || > > + (max_commits && num_commits > max_commits) || > > + (ctx->split_opts->flags == COMMIT_GRAPH_SPLIT_MERGE_REQUIRED))) { > > + if (g->odb != ctx->odb) > > + break; > > > > - num_commits += g->num_commits; > > - g = g->base_graph; > > + num_commits += g->num_commits; > > + g = g->base_graph; > > > > - ctx->num_commit_graphs_after--; > > + ctx->num_commit_graphs_after--; > > + } > > } > > Thanks, Taylor