diff options
author | Stefan Beller <sbeller@google.com> | 2018-11-14 03:12:48 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-14 11:22:40 +0300 |
commit | 9b45f499818f505f8f7797c6d8f63a3bdccfa95f (patch) | |
tree | f7600e32ea37a701d689b28910e9c694720ae8da /sha1-file.c | |
parent | afd69dcc21972d766211ac253af2c18384e93056 (diff) |
object-store: prepare has_{sha1, object}_file to handle any repo
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-file.c')
-rw-r--r-- | sha1-file.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sha1-file.c b/sha1-file.c index c5b704aec50..e77273ccfd4 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -1768,24 +1768,27 @@ int force_object_loose(const struct object_id *oid, time_t mtime) return ret; } -int has_sha1_file_with_flags(const unsigned char *sha1, int flags) +int repo_has_sha1_file_with_flags(struct repository *r, + const unsigned char *sha1, int flags) { struct object_id oid; if (!startup_info->have_repository) return 0; hashcpy(oid.hash, sha1); - return oid_object_info_extended(the_repository, &oid, NULL, + return oid_object_info_extended(r, &oid, NULL, flags | OBJECT_INFO_SKIP_CACHED) >= 0; } -int has_object_file(const struct object_id *oid) +int repo_has_object_file(struct repository *r, + const struct object_id *oid) { - return has_sha1_file(oid->hash); + return repo_has_sha1_file(r, oid->hash); } -int has_object_file_with_flags(const struct object_id *oid, int flags) +int repo_has_object_file_with_flags(struct repository *r, + const struct object_id *oid, int flags) { - return has_sha1_file_with_flags(oid->hash, flags); + return repo_has_sha1_file_with_flags(r, oid->hash, flags); } static void check_tree(const void *buf, size_t size) |