diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:16 +0900 |
| commit | fcb6df325468a7ae12949ab80dcd37772b9b1fbf (patch) | |
| tree | 7ae13a8a1c4f7b417403b6f7f64f34a9565dbab2 /packfile.h | |
| parent | d0f7b22b5bf0847a6e0fe039feb598819dffab4c (diff) | |
| parent | 9d98354f48997faf8251c566d909957f6ae427d5 (diff) | |
| download | git-fcb6df325468a7ae12949ab80dcd37772b9b1fbf.tar.gz | |
Merge branch 'sb/oid-object-info'
The codepath around object-info API has been taught to take the
repository object (which in turn tells the API which object store
the objects are to be located).
* sb/oid-object-info:
cache.h: allow oid_object_info to handle arbitrary repositories
packfile: add repository argument to cache_or_unpack_entry
packfile: add repository argument to unpack_entry
packfile: add repository argument to read_object
packfile: add repository argument to packed_object_info
packfile: add repository argument to packed_to_object_type
packfile: add repository argument to retry_bad_packed_offset
cache.h: add repository argument to oid_object_info
cache.h: add repository argument to oid_object_info_extended
Diffstat (limited to 'packfile.h')
| -rw-r--r-- | packfile.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packfile.h b/packfile.h index 9c2f885994..bfd0b5399d 100644 --- a/packfile.h +++ b/packfile.h @@ -116,7 +116,7 @@ extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n); extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *); extern int is_pack_valid(struct packed_git *); -extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *); +extern void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object_type *, unsigned long *); extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep); extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t); extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *); @@ -126,7 +126,9 @@ extern void release_pack_memory(size_t); /* global flag to enable extra checks when accessing packed objects */ extern int do_check_packed_object_crc; -extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *); +extern int packed_object_info(struct repository *r, + struct packed_git *pack, + off_t offset, struct object_info *); extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1); extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1); |