diff options
| author | Stefan Beller <sbeller@google.com> | 2018-04-25 11:21:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 10:54:27 +0900 |
| commit | 57a6a500be8d8ee903a1dc9ea607063a1bc88a0b (patch) | |
| tree | 509aebb4765d687f4d6aa8a9e90eb967d7af92e6 /packfile.c | |
| parent | 5da6534dd6ef72970989aa5a4194e13e6a587bd6 (diff) | |
| download | git-57a6a500be8d8ee903a1dc9ea607063a1bc88a0b.tar.gz | |
packfile: add repository argument to unpack_entry
Add a repository argument to allow the callers of unpack_entry
to be more specific about which repository to act on. 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: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
| -rw-r--r-- | packfile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packfile.c b/packfile.c index 2876e04bb1..d5ac48ef18 100644 --- a/packfile.c +++ b/packfile.c @@ -1279,7 +1279,7 @@ static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset, ent = get_delta_base_cache_entry(p, base_offset); if (!ent) - return unpack_entry(p, base_offset, type, base_size); + return unpack_entry(the_repository, p, base_offset, type, base_size); if (type) *type = ent->type; @@ -1485,8 +1485,9 @@ static void *read_object_the_repository(const struct object_id *oid, return content; } -void *unpack_entry(struct packed_git *p, off_t obj_offset, - enum object_type *final_type, unsigned long *final_size) +void *unpack_entry_the_repository(struct packed_git *p, off_t obj_offset, + enum object_type *final_type, + unsigned long *final_size) { struct pack_window *w_curs = NULL; off_t curpos = obj_offset; |