THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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>
tags/v2.23.0-rc0
Jeff King Junio C Hamano 4 months ago
parent
commit
0ebbcf70e6
10 changed files with 14 additions and 14 deletions
  1. +1
    -1
      builtin/fsck.c
  2. +1
    -1
      builtin/pack-objects.c
  3. +1
    -1
      fsck.c
  4. +1
    -1
      http-push.c
  5. +3
    -3
      object.c
  6. +1
    -1
      object.h
  7. +1
    -1
      refs.c
  8. +3
    -3
      t/helper/test-example-decorate.c
  9. +1
    -1
      upload-pack.c
  10. +1
    -1
      walker.c

+ 1
- 1
builtin/fsck.c View File

@@ -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;
}


+ 1
- 1
builtin/pack-objects.c View File

@@ -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;

+ 1
- 1
fsck.c View File

@@ -1092,7 +1092,7 @@ int fsck_finish(struct fsck_options *options)

blob = lookup_blob(the_repository, oid);
if (!blob) {
struct object *obj = lookup_unknown_object(oid->hash);
struct object *obj = lookup_unknown_object(oid);
ret |= report(options, obj,
FSCK_MSG_GITMODULES_BLOB,
"non-blob found at .gitmodules");

+ 1
- 1
http-push.c View File

@@ -1432,7 +1432,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.hash);
obj = lookup_unknown_object(&ref->old_oid);
fprintf(stderr, " fetch %s for %s\n",
oid_to_hex(&ref->old_oid), refname);
add_fetch_request(obj);

+ 3
- 3
object.c View File

@@ -178,11 +178,11 @@ void *object_as_type(struct repository *r, struct object *obj, enum object_type
}
}

struct object *lookup_unknown_object(const unsigned char *sha1)
struct object *lookup_unknown_object(const struct object_id *oid)
{
struct object *obj = lookup_object(the_repository, sha1);
struct object *obj = lookup_object(the_repository, oid->hash);
if (!obj)
obj = create_object(the_repository, sha1,
obj = create_object(the_repository, oid->hash,
alloc_object_node(the_repository));
return obj;
}

+ 1
- 1
object.h View File

@@ -143,7 +143,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 unsigned char *sha1);
struct object *lookup_unknown_object(const struct object_id *oid);

struct object_list *object_list_insert(struct object *item,
struct object_list **list_p);

+ 1
- 1
refs.c View File

@@ -379,7 +379,7 @@ 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->hash);
struct object *o = lookup_unknown_object(name);

if (o->type == OBJ_NONE) {
int type = oid_object_info(the_repository, name, NULL);

+ 3
- 3
t/helper/test-example-decorate.c View File

@@ -26,8 +26,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.hash);
two = lookup_unknown_object(two_oid.hash);
one = lookup_unknown_object(&one_oid);
two = lookup_unknown_object(&two_oid);
ret = add_decoration(&n, one, &decoration_a);
if (ret)
BUG("when adding a brand-new object, NULL should be returned");
@@ -56,7 +56,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.hash);
three = lookup_unknown_object(&three_oid);
ret = lookup_decoration(&n, three);
if (ret)
BUG("lookup for unknown object should return NULL");

+ 1
- 1
upload-pack.c View File

@@ -960,7 +960,7 @@ 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->hash);
struct object *o = lookup_unknown_object(oid);

if (ref_is_hidden(refname, refname_full)) {
o->flags |= HIDDEN_REF;

+ 1
- 1
walker.c View File

@@ -285,7 +285,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].hash)))
if (process(walker, lookup_unknown_object(&oids[i])))
goto done;
}


Loading…
Cancel
Save