diff options
Diffstat (limited to 'object-store.h')
| -rw-r--r-- | object-store.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/object-store.h b/object-store.h index ba57630677f..14fc935bd1b 100644 --- a/object-store.h +++ b/object-store.h @@ -154,11 +154,13 @@ void raw_object_store_clear(struct raw_object_store *o); /* * Put in `buf` the name of the file in the local object database that - * would be used to store a loose object with the specified sha1. + * would be used to store a loose object with the specified oid. */ -const char *loose_object_path(struct repository *r, struct strbuf *buf, const unsigned char *sha1); +const char *loose_object_path(struct repository *r, struct strbuf *buf, + const struct object_id *oid); -void *map_sha1_file(struct repository *r, const unsigned char *sha1, unsigned long *size); +void *map_loose_object(struct repository *r, const struct object_id *oid, + unsigned long *size); extern void *read_object_file_extended(struct repository *r, const struct object_id *oid, @@ -206,19 +208,6 @@ int read_loose_object(const char *path, unsigned long *size, void **contents); -/* - * Convenience for sha1_object_info_extended() with a NULL struct - * object_info. OBJECT_INFO_SKIP_CACHED is automatically set; pass - * nonzero flags to also set other flags. - */ -int repo_has_sha1_file_with_flags(struct repository *r, - const unsigned char *sha1, int flags); -static inline int repo_has_sha1_file(struct repository *r, - const unsigned char *sha1) -{ - return repo_has_sha1_file_with_flags(r, sha1, 0); -} - #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags) #define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1) |