diff options
| author | Jeff King <peff@peff.net> | 2019-06-20 03:41:10 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-20 10:06:19 -0700 |
| commit | 0ebbcf70e672ef9ad46eb4975a34d3639190aeb2 (patch) | |
| tree | a12303cc5e438a049ba51eecdbfac515139156d2 /builtin | |
| parent | 5e7ac6802823ec23759b1b986315bd65b0881ff9 (diff) | |
| download | git-0ebbcf70e672ef9ad46eb4975a34d3639190aeb2.tar.gz | |
object: convert lookup_unknown_object() to use object_id
There are no callers left of lookup_unknown_object() that aren't just
passing us the "hash" member of a "struct object_id". Let's take the
whole struct, which gets us closer to removing all raw sha1 variables.
It also matches the existing conversions of lookup_blob(), etc.
The conversions of callers were done by hand, but they're all mechanical
one-liners.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 d26fb0a044..e422c82465 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -756,7 +756,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->hash); + struct object *obj = lookup_unknown_object(oid); obj->flags |= HAS_OBJ; } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c95693fd4b..3e8467aa23 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2923,7 +2923,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.hash); + o = lookup_unknown_object(&oid); if (!(o->flags & OBJECT_ADDED)) mark_in_pack_object(o, p, &in_pack); o->flags |= OBJECT_ADDED; |