diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 07:50:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 07:50:24 +0300 |
| commit | 13158b9910f8de4a88b39420be80f03c681b3ec9 (patch) | |
| tree | 606be7ce14f379439bdb5341eced6b1a85def26c /builtin | |
| parent | 311531c9de557d25ac087c1637818bd2aad6eb3a (diff) | |
| parent | c1fa951d7ea9e943f001ac7c7502995273db5776 (diff) | |
Merge branch 'jk/promisor-optim'
Handling of "promisor packs" that allows certain objects to be
missing and lazily retrievable has been optimized (a bit).
* jk/promisor-optim:
revision: avoid parsing with --exclude-promisor-objects
lookup_unknown_object(): take a repository argument
is_promisor_object(): free tree buffer after parsing
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fsck.c | 2 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 70ff95837a..e6a80e5404 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -725,7 +725,7 @@ 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 object *obj = lookup_unknown_object(the_repository, oid); obj->flags |= HAS_OBJ; } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 247a08d024..6d13cd3e1a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3386,7 +3386,7 @@ static void add_objects_in_unpacked_packs(void) for (i = 0; i < p->num_objects; i++) { nth_packed_object_id(&oid, p, i); - o = lookup_unknown_object(&oid); + o = lookup_unknown_object(the_repository, &oid); if (!(o->flags & OBJECT_ADDED)) mark_in_pack_object(o, p, &in_pack); o->flags |= OBJECT_ADDED; |