object-store: drop repo_has_object_file()
In the preceding commits we have converted all users of `repo_has_object_file()` and its `_with_flags()` variant to instead use `has_object()`. Drop these functions. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
062b914c84
commit
8a9e27be82
@@ -949,20 +949,6 @@ int has_object(struct repository *r, const struct object_id *oid,
|
||||
return oid_object_info_extended(r, oid, NULL, object_info_flags) >= 0;
|
||||
}
|
||||
|
||||
int repo_has_object_file_with_flags(struct repository *r,
|
||||
const struct object_id *oid, int flags)
|
||||
{
|
||||
if (!startup_info->have_repository)
|
||||
return 0;
|
||||
return oid_object_info_extended(r, oid, NULL, flags) >= 0;
|
||||
}
|
||||
|
||||
int repo_has_object_file(struct repository *r,
|
||||
const struct object_id *oid)
|
||||
{
|
||||
return repo_has_object_file_with_flags(r, oid, 0);
|
||||
}
|
||||
|
||||
void assert_oid_type(const struct object_id *oid, enum object_type expect)
|
||||
{
|
||||
enum object_type type = oid_object_info(the_repository, oid, NULL);
|
||||
|
||||
@@ -276,23 +276,6 @@ enum {
|
||||
int has_object(struct repository *r, const struct object_id *oid,
|
||||
unsigned flags);
|
||||
|
||||
/*
|
||||
* These macros and functions are deprecated. If checking existence for an
|
||||
* object that is likely to be missing and/or whose absence is relatively
|
||||
* inconsequential (or is consequential but the caller is prepared to handle
|
||||
* it), use has_object(), which has better defaults (no lazy fetch in a partial
|
||||
* clone and no rechecking of packed storage). In the unlikely event that a
|
||||
* caller needs to assert existence of an object that it fully expects to
|
||||
* exist, and wants to trigger a lazy fetch in a partial clone, use
|
||||
* oid_object_info_extended() with a NULL struct object_info.
|
||||
*
|
||||
* These functions can be removed once all callers have migrated to
|
||||
* has_object() and/or oid_object_info_extended().
|
||||
*/
|
||||
int repo_has_object_file(struct repository *r, const struct object_id *oid);
|
||||
int repo_has_object_file_with_flags(struct repository *r,
|
||||
const struct object_id *oid, int flags);
|
||||
|
||||
void assert_oid_type(const struct object_id *oid, enum object_type expect);
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user