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=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 15E4D1F45E for ; Wed, 12 Feb 2020 19:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729047AbgBLTTU (ORCPT ); Wed, 12 Feb 2020 14:19:20 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39007 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729014AbgBLTTS (ORCPT ); Wed, 12 Feb 2020 14:19:18 -0500 Received: by mail-wr1-f68.google.com with SMTP id y11so3776465wrt.6 for ; Wed, 12 Feb 2020 11:19:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=cYLhlv6Dz+y9YrL+GDMzuCKIcLI4bnqjtmLgzZx8rfc=; b=AsIW0dpPd7xRsqLoy7AUDHP/yPO3BDGQBpQjFqjdVcp9LkwCEP75+xRE0U2Odpcqi0 +g9U/TO0g90+c5+Nwku/cmAl1zjHrq7rZPwZEWXfH6yerQSDvRC3TrcicARCxKzX+B2W dCFz1xxhAZwI2dMiH/2wcHiRon7VvqrzC2Eiujy1KD10qGK2Y/wQXUfrHo+Y3xUavM49 hbK7Uaubht8xYVrTY39QRESRR/wikIKy3dG8XcjvrpGxwHind8GjGTeMi/jDW69BpMNJ LDB6Z1SwamFFi772zBe2jOggUvIFDto/4584DTrGQG25w3Nscg6wmMC2hKm6JXdGQas1 sRAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=cYLhlv6Dz+y9YrL+GDMzuCKIcLI4bnqjtmLgzZx8rfc=; b=MgpguHhLQIdmi/eXu477z/+DAF+zyG8sSUNAkBl+N+JqC6wB+ZS+95LbSpWtc8KJBp gvlU1I9pyXZ+4+MYQJwBAZo/D5HQwwvmheB68mji0wvTwHkuqL/mc2Gyw9SOB4IFZiY7 70pbVuDDWz1Q/nGgxp26sUuiYRksep3GVix7wDQ187h5aQIN3S/wBO0RGBn/qRwkxFcT ljNLi84VtOuONq13+bbZvADmOMi370DvjWsqC8D3+gcvtdZ/hccO9BeU2V3uP06SYhp9 4SyVH8Jfrd6W7m319F0poKtl5a6WOo9wdupmAJeSbHGctrObWayvDJcR1v4i5EA9QG5W PMNQ== X-Gm-Message-State: APjAAAUR32Yy84hByedKVrxqNHJduPswGWdSpjKUm3ITO5RLmX6A8B6b 7WxXn7OmOCDcz1SrDrlOr9QumLnD X-Google-Smtp-Source: APXvYqwrQCZ2VmPpoZAdc3sAGNehKp5s7SHg2Ztdd27gzg4ngAtpsjTqMUggZ67lCHtDsraRyuSBVA== X-Received: by 2002:a5d:498f:: with SMTP id r15mr16452950wrq.284.1581535153803; Wed, 12 Feb 2020 11:19:13 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i4sm1881478wmd.23.2020.02.12.11.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 11:19:13 -0800 (PST) Message-Id: <16dd64618ab6a086727685e9eca3850fabc46437.1581535151.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Parth Gala via GitGitGadget" Date: Wed, 12 Feb 2020 19:19:08 +0000 Subject: [PATCH 2/5] object.c: lookup_unknown_object() accept 'r' as parameter Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Parth Gala , Parth Gala Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Parth Gala 'lookup_unknown_object()' and its callers are modified to enable passing 'r' as an argument to 'lookup_unknown_object()' in an effort to reduce dependence on global 'the_repository' variable. Signed-off-by: Parth Gala --- builtin/fsck.c | 3 ++- builtin/pack-objects.c | 3 ++- http-push.c | 3 ++- object.c | 8 ++++---- object.h | 2 +- refs.c | 3 ++- t/helper/test-example-decorate.c | 7 ++++--- upload-pack.c | 3 ++- walker.c | 3 ++- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index d2b4336f7e..cd0b67f3bc 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -745,7 +745,8 @@ static int fsck_cache_tree(struct cache_tree *it) static void mark_object_for_connectivity(const struct object_id *oid) { - struct object *obj = lookup_unknown_object(oid); + struct repository *r = the_repository; + struct object *obj = lookup_unknown_object(r, oid); obj->flags |= HAS_OBJ; } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 393c20a2d7..b03f4378a0 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2891,6 +2891,7 @@ static void add_objects_in_unpacked_packs(void) { struct packed_git *p; struct in_pack in_pack; + struct repository *r = the_repository; uint32_t i; memset(&in_pack, 0, sizeof(in_pack)); @@ -2910,7 +2911,7 @@ static void add_objects_in_unpacked_packs(void) for (i = 0; i < p->num_objects; i++) { nth_packed_object_oid(&oid, p, i); - o = lookup_unknown_object(&oid); + o = lookup_unknown_object(r, &oid); if (!(o->flags & OBJECT_ADDED)) mark_in_pack_object(o, p, &in_pack); o->flags |= OBJECT_ADDED; diff --git a/http-push.c b/http-push.c index 822f326599..c26d03b21b 100644 --- a/http-push.c +++ b/http-push.c @@ -1416,6 +1416,7 @@ static void one_remote_ref(const char *refname) { struct ref *ref; struct object *obj; + struct repository *r = the_repository; ref = alloc_ref(refname); @@ -1432,7 +1433,7 @@ static void one_remote_ref(const char *refname) * may be required for updating server info later. */ if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) { - obj = lookup_unknown_object(&ref->old_oid); + obj = lookup_unknown_object(r, &ref->old_oid); fprintf(stderr, " fetch %s for %s\n", oid_to_hex(&ref->old_oid), refname); add_fetch_request(obj); diff --git a/object.c b/object.c index 549fbe69ca..90338a509c 100644 --- a/object.c +++ b/object.c @@ -177,12 +177,12 @@ void *object_as_type(struct repository *r, struct object *obj, enum object_type } } -struct object *lookup_unknown_object(const struct object_id *oid) +struct object *lookup_unknown_object(struct repository *r, const struct object_id *oid) { - struct object *obj = lookup_object(the_repository, oid); + struct object *obj = lookup_object(r, oid); if (!obj) - obj = create_object(the_repository, oid, - alloc_object_node(the_repository)); + obj = create_object(r, oid, + alloc_object_node(r)); return obj; } diff --git a/object.h b/object.h index 5a8ae274ee..375236cec3 100644 --- a/object.h +++ b/object.h @@ -144,7 +144,7 @@ struct object *parse_object_or_die(const struct object_id *oid, const char *name struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p); /** Returns the object, with potentially excess memory allocated. **/ -struct object *lookup_unknown_object(const struct object_id *oid); +struct object *lookup_unknown_object(struct repository *, const struct object_id *oid); struct object_list *object_list_insert(struct object *item, struct object_list **list_p); diff --git a/refs.c b/refs.c index 1ab0bb54d3..a630a8c271 100644 --- a/refs.c +++ b/refs.c @@ -379,7 +379,8 @@ static int filter_refs(const char *refname, const struct object_id *oid, enum peel_status peel_object(const struct object_id *name, struct object_id *oid) { - struct object *o = lookup_unknown_object(name); + struct repository *r = the_repository; + struct object *o = lookup_unknown_object(r, name); if (o->type == OBJ_NONE) { int type = oid_object_info(the_repository, name, NULL); diff --git a/t/helper/test-example-decorate.c b/t/helper/test-example-decorate.c index c8a1cde7d2..6b3262a9d3 100644 --- a/t/helper/test-example-decorate.c +++ b/t/helper/test-example-decorate.c @@ -10,6 +10,7 @@ int cmd__example_decorate(int argc, const char **argv) struct object_id two_oid = { {2} }; struct object_id three_oid = { {3} }; struct object *one, *two, *three; + struct repository *r = the_repository; int decoration_a, decoration_b; @@ -26,8 +27,8 @@ int cmd__example_decorate(int argc, const char **argv) * Add 2 objects, one with a non-NULL decoration and one with a NULL * decoration. */ - one = lookup_unknown_object(&one_oid); - two = lookup_unknown_object(&two_oid); + one = lookup_unknown_object(r, &one_oid); + two = lookup_unknown_object(r, &two_oid); ret = add_decoration(&n, one, &decoration_a); if (ret) BUG("when adding a brand-new object, NULL should be returned"); @@ -56,7 +57,7 @@ int cmd__example_decorate(int argc, const char **argv) ret = lookup_decoration(&n, two); if (ret != &decoration_b) BUG("lookup should return added declaration"); - three = lookup_unknown_object(&three_oid); + three = lookup_unknown_object(r, &three_oid); ret = lookup_decoration(&n, three); if (ret) BUG("lookup for unknown object should return NULL"); diff --git a/upload-pack.c b/upload-pack.c index cb7312268f..6d196e275b 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -962,7 +962,8 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan static int mark_our_ref(const char *refname, const char *refname_full, const struct object_id *oid) { - struct object *o = lookup_unknown_object(oid); + struct repository *r = the_repository; + struct object *o = lookup_unknown_object(r, oid); if (ref_is_hidden(refname, refname_full)) { o->flags |= HIDDEN_REF; diff --git a/walker.c b/walker.c index 06cd2bd569..098c69ebe1 100644 --- a/walker.c +++ b/walker.c @@ -258,6 +258,7 @@ void walker_targets_free(int targets, char **target, const char **write_ref) int walker_fetch(struct walker *walker, int targets, char **target, const char **write_ref, const char *write_ref_log_details) { + struct repository *r = the_repository; struct strbuf refname = STRBUF_INIT; struct strbuf err = STRBUF_INIT; struct ref_transaction *transaction = NULL; @@ -285,7 +286,7 @@ int walker_fetch(struct walker *walker, int targets, char **target, error("Could not interpret response from server '%s' as something to pull", target[i]); goto done; } - if (process(walker, lookup_unknown_object(&oids[i]))) + if (process(walker, lookup_unknown_object(r, &oids[i]))) goto done; } -- gitgitgadget