cache.h: add repository argument to oid_object_info
Add a repository argument to allow the callers of oid_object_info to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
7ecd869060
commit
0df8e96566
@ -1516,7 +1516,8 @@ static void check_object(struct object_entry *entry)
|
||||
unuse_pack(&w_curs);
|
||||
}
|
||||
|
||||
entry->type = oid_object_info(&entry->idx.oid, &entry->size);
|
||||
entry->type = oid_object_info(the_repository, &entry->idx.oid,
|
||||
&entry->size);
|
||||
/*
|
||||
* The error condition is checked in prepare_pack(). This is
|
||||
* to permit a missing preferred base object to be ignored
|
||||
@ -1578,7 +1579,8 @@ static void drop_reused_delta(struct object_entry *entry)
|
||||
* And if that fails, the error will be recorded in entry->type
|
||||
* and dealt with in prepare_pack().
|
||||
*/
|
||||
entry->type = oid_object_info(&entry->idx.oid, &entry->size);
|
||||
entry->type = oid_object_info(the_repository, &entry->idx.oid,
|
||||
&entry->size);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2706,7 +2708,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
|
||||
static int add_loose_object(const struct object_id *oid, const char *path,
|
||||
void *data)
|
||||
{
|
||||
enum object_type type = oid_object_info(oid, NULL);
|
||||
enum object_type type = oid_object_info(the_repository, oid, NULL);
|
||||
|
||||
if (type < 0) {
|
||||
warning("loose object at %s could not be examined", path);
|
||||
|
||||
Reference in New Issue
Block a user