From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_DKIMWL_WL_HIGH shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id E03511F406 for ; Thu, 10 May 2018 17:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966745AbeEJReS (ORCPT ); Thu, 10 May 2018 13:34:18 -0400 Received: from mail-dm3nam03on0090.outbound.protection.outlook.com ([104.47.41.90]:53659 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966717AbeEJReN (ORCPT ); Thu, 10 May 2018 13:34:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=C/nt2KSZGJJ5V4+/s7RRGi9WFLYcEaX/8F3M03n+8ZA=; b=DmrTs6jOny9FJQl9Nrb0FYMx/XyS0s46P7q2SMo9dIrQ4+oyrb06DJyUPzuUIVae2Vc3oc4Qm8lW9LrIN9umCor9ppZRMS2722J0Oll472jcSTwSnCRC5LHYAPcsnQpYbfDu34mFYjVZIOH/dhPMjAdA2Ts1oHV+j9wgO7tY/xA= Received: from BL0PR2101MB1011.namprd21.prod.outlook.com (52.132.24.10) by BL0PR2101MB0962.namprd21.prod.outlook.com (52.132.20.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.776.1; Thu, 10 May 2018 17:34:10 +0000 Received: from BL0PR2101MB1011.namprd21.prod.outlook.com ([fe80::714b:5398:58e0:b4d8]) by BL0PR2101MB1011.namprd21.prod.outlook.com ([fe80::714b:5398:58e0:b4d8%3]) with mapi id 15.20.0776.004; Thu, 10 May 2018 17:34:10 +0000 From: Derrick Stolee To: "git@vger.kernel.org" CC: "peff@peff.net" , "sbeller@google.com" , "jnareb@gmail.com" , "stolee@gmail.com" , Derrick Stolee Subject: [PATCH 06/12] commit-graph: load a root tree from specific graph Thread-Topic: [PATCH 06/12] commit-graph: load a root tree from specific graph Thread-Index: AQHT6IUaEY401UkRu0yXO1tbZZu9/A== Date: Thu, 10 May 2018 17:34:10 +0000 Message-ID: <20180510173345.40577-7-dstolee@microsoft.com> References: <20180417181028.198397-1-dstolee@microsoft.com> <20180510173345.40577-1-dstolee@microsoft.com> In-Reply-To: <20180510173345.40577-1-dstolee@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR14CA0004.namprd14.prod.outlook.com (2603:10b6:404:79::14) To BL0PR2101MB1011.namprd21.prod.outlook.com (2603:10b6:207:37::10) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [2001:4898:8010:0:eb4a:5dff:fe0f:730f] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BL0PR2101MB0962;7:Ukz4Bw5d+Sngh5EmoW6EtawAg7AdrNe2/cJNDD5azWp1WQplwDGpgRI5QbJccdGXoW/8P3P8CktrpIVr+zb/oc8K/UdisTsQ7XCqTFweWgBSkwaGDn2qjASgqH0U/yUmgRngdLo6IGiIVVkQC8K+aKR6dJKIr5JxntghaKlWpovOsSV4ypc0KNtrvcPMIqYbTCI5rE5BZdiZQQBVwkldp+0BN5qNy2JnpVHbMXF12wdgfmbCP1mIrsdR44Gm2+Yz;20:aMFJsTmkXRmucdR1ZP+VaRwXspObu9K7h0U/f6sLkt6eH3BS96U9WPii3ZjxW+jTbhmFF+IAYtSxbQxI/T/540/+SI7lNBkiOw1ip5T04WaUP+e6WBJh+VzgKXYXPZjqm3BEgjUuhg8UcJ5UU4wgIWy7iQYMutRkHwGgWU26f0c= x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:BL0PR2101MB0962; x-ms-traffictypediagnostic: BL0PR2101MB0962: authentication-results: spf=none (sender IP is ) smtp.mailfrom=dstolee@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231254)(2018427008)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:BL0PR2101MB0962;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB0962; x-forefront-prvs: 066898046A x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(346002)(376002)(39860400002)(396003)(366004)(199004)(189003)(6916009)(5250100002)(107886003)(4326008)(105586002)(8676002)(36756003)(476003)(2501003)(2616005)(8936002)(14454004)(2906002)(2900100001)(86362001)(10290500003)(6512007)(478600001)(53936002)(10090500001)(86612001)(486006)(25786009)(6486002)(5640700003)(46003)(76176011)(1730700003)(386003)(305945005)(5660300001)(316002)(54906003)(39060400002)(81166006)(81156014)(3660700001)(186003)(6506007)(52116002)(7736002)(3280700002)(102836004)(2351001)(97736004)(1076002)(99286004)(6116002)(11346002)(22452003)(106356001)(446003)(68736007)(59450400001)(6436002)(22906009);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB0962;H:BL0PR2101MB1011.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: eFSrt2NXZ8XXk2VbGpFdFrNZpR2ENSz70Prq8b0IR7DfPJ07phTxGvCzzw1/wHfHV2StumC/WSQ8lSvTHoq+xuUbje5M+gYsJ80gcMCjYNPHyW/tq5qxjFc3a4lb1Iqe92tMSbkyzWHKugVvkNDhnaXt2XJdcAldJPYRQbFLlvMma5M6dDRINeVOXwbaN44w spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 6fc55bbe-e1cb-4f62-1328-08d5b69c3cdf X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fc55bbe-e1cb-4f62-1328-08d5b69c3cdf X-MS-Exchange-CrossTenant-originalarrivaltime: 10 May 2018 17:34:10.0512 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB0962 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When lazy-loading a tree for a commit, it will be important to select the tree from a specific struct commit_graph. Create a new method that specifies the commit-graph file and use that in get_commit_tree_in_graph(). Signed-off-by: Derrick Stolee --- commit-graph.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index b4c146c423..8c636abba9 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -357,14 +357,20 @@ static struct tree *load_tree_for_commit(struct commi= t_graph *g, struct commit * return c->maybe_tree; } =20 -struct tree *get_commit_tree_in_graph(const struct commit *c) +static struct tree *get_commit_tree_in_graph_one(struct commit_graph *g, + const struct commit *c) { if (c->maybe_tree) return c->maybe_tree; if (c->graph_pos =3D=3D COMMIT_NOT_FROM_GRAPH) BUG("get_commit_tree_in_graph called from non-commit-graph commit"); =20 - return load_tree_for_commit(commit_graph, (struct commit *)c); + return load_tree_for_commit(g, (struct commit *)c); +} + +struct tree *get_commit_tree_in_graph(const struct commit *c) +{ + return get_commit_tree_in_graph_one(commit_graph, c); } =20 static void write_graph_chunk_fanout(struct hashfile *f, --=20 2.16.2.329.gfb62395de6